From 9133bd8747eb9c3a9e844af72b07f86a3024d7ae Mon Sep 17 00:00:00 2001 From: Balint Reczey Date: Fri, 4 Nov 2016 16:37:59 +0100 Subject: [PATCH] Get rid of embedded live555 --- CMakeLists.txt | 99 +------------------------------------------------- 1 file changed, 1 insertion(+), 98 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f612570..cb8c807 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,11 +20,8 @@ include_directories(${TINYXML_INCLUDE_DIR} ${KODI_INCLUDE_DIR}/.. # Hack way with "/..", need bigger Kodi cmake rework to match right include ways ${PROJECT_SOURCE_DIR}/src ${PROJECT_BINARY_DIR} - ${LIVE555_INCLUDE_DIR} ) -add_definitions(-D__STDC_FORMAT_MACROS ${LIVE555_DEFINES}) - if (NOT WIN32) add_options(ALL_LANGUAGES ALL_BUILDS "-fPIC") endif() @@ -130,102 +127,8 @@ set(TSREADER_HEADERS src/lib/tsreader/ChannelInfo.h src/lib/tsreader/TSReader.h) source_group("Header Files\\lib\\tsreader" FILES ${TSREADER_HEADERS}) -#Live555 subset sources -SET(LIVE555_SOURCES - src/lib/live555/BasicUsageEnvironment/BasicHashTable.cpp - src/lib/live555/BasicUsageEnvironment/BasicTaskScheduler.cpp - src/lib/live555/BasicUsageEnvironment/BasicTaskScheduler0.cpp - src/lib/live555/BasicUsageEnvironment/BasicUsageEnvironment.cpp - src/lib/live555/BasicUsageEnvironment/BasicUsageEnvironment0.cpp - src/lib/live555/BasicUsageEnvironment/DelayQueue.cpp - src/lib/live555/UsageEnvironment/HashTable.cpp - src/lib/live555/UsageEnvironment/UsageEnvironment.cpp - src/lib/live555/UsageEnvironment/strDup.cpp - src/lib/live555/groupsock/GroupEId.cpp - src/lib/live555/groupsock/Groupsock.cpp - src/lib/live555/groupsock/GroupsockHelper.cpp - src/lib/live555/groupsock/IOHandlers.cpp - src/lib/live555/groupsock/NetAddress.cpp - src/lib/live555/groupsock/NetInterface.cpp - src/lib/live555/groupsock/inet.c - src/lib/live555/liveMedia/Base64.cpp - src/lib/live555/liveMedia/BasicUDPSource.cpp - src/lib/live555/liveMedia/DigestAuthentication.cpp - src/lib/live555/liveMedia/FramedFilter.cpp - src/lib/live555/liveMedia/FramedSource.cpp - src/lib/live555/liveMedia/Locale.cpp - src/lib/live555/liveMedia/MPEG2TransportStreamFramer.cpp - src/lib/live555/liveMedia/Media.cpp - src/lib/live555/liveMedia/MediaSession.cpp - src/lib/live555/liveMedia/MediaSink.cpp - src/lib/live555/liveMedia/MediaSource.cpp - src/lib/live555/liveMedia/MultiFramedRTPSink.cpp - src/lib/live555/liveMedia/MultiFramedRTPSource.cpp - src/lib/live555/liveMedia/RTCP.cpp - src/lib/live555/liveMedia/RTPInterface.cpp - src/lib/live555/liveMedia/RTPSink.cpp - src/lib/live555/liveMedia/RTPSource.cpp - src/lib/live555/liveMedia/RTSPClient.cpp - src/lib/live555/liveMedia/RTSPCommon.cpp - src/lib/live555/liveMedia/SimpleRTPSink.cpp - src/lib/live555/liveMedia/SimpleRTPSource.cpp - src/lib/live555/liveMedia/our_md5.c - src/lib/live555/liveMedia/our_md5hl.c - src/lib/live555/liveMedia/rtcp_from_spec.c -) -source_group("Source Files\\lib\\live555" FILES ${LIVE555_SOURCES}) - -SET(LIVE555_HEADERS - src/lib/live555/groupsock/include/NetCommon.h - src/lib/live555/liveMedia/our_md5.h - src/lib/live555/liveMedia/rtcp_from_spec.h - src/lib/live555/BasicUsageEnvironment/include/BasicHashTable.hh - src/lib/live555/BasicUsageEnvironment/include/BasicUsageEnvironment.hh - src/lib/live555/BasicUsageEnvironment/include/BasicUsageEnvironment0.hh - src/lib/live555/BasicUsageEnvironment/include/BasicUsageEnvironment_version.hh - src/lib/live555/BasicUsageEnvironment/include/DelayQueue.hh - src/lib/live555/BasicUsageEnvironment/include/HandlerSet.hh - src/lib/live555/groupsock/include/GroupEId.hh - src/lib/live555/groupsock/include/Groupsock.hh - src/lib/live555/groupsock/include/GroupsockHelper.hh - src/lib/live555/groupsock/include/groupsock_version.hh - src/lib/live555/groupsock/include/IOHandlers.hh - src/lib/live555/groupsock/include/NetAddress.hh - src/lib/live555/groupsock/include/NetInterface.hh - src/lib/live555/groupsock/include/TunnelEncaps.hh - src/lib/live555/liveMedia/include/Base64.hh - src/lib/live555/liveMedia/include/BasicUDPSource.hh - src/lib/live555/liveMedia/include/DigestAuthentication.hh - src/lib/live555/liveMedia/include/FramedFilter.hh - src/lib/live555/liveMedia/include/FramedSource.hh - src/lib/live555/liveMedia/include/liveMedia.hh - src/lib/live555/liveMedia/include/liveMedia_version.hh - src/lib/live555/liveMedia/include/Locale.hh - src/lib/live555/liveMedia/include/Media.hh - src/lib/live555/liveMedia/include/MediaSession.hh - src/lib/live555/liveMedia/include/MediaSink.hh - src/lib/live555/liveMedia/include/MediaSource.hh - src/lib/live555/liveMedia/include/MPEG2TransportStreamFramer.hh - src/lib/live555/liveMedia/include/MultiFramedRTPSink.hh - src/lib/live555/liveMedia/include/MultiFramedRTPSource.hh - src/lib/live555/liveMedia/include/RTCP.hh - src/lib/live555/liveMedia/include/RTPInterface.hh - src/lib/live555/liveMedia/include/RTPSink.hh - src/lib/live555/liveMedia/include/RTPSource.hh - src/lib/live555/liveMedia/include/RTSPClient.hh - src/lib/live555/liveMedia/include/RTSPCommon.hh - src/lib/live555/liveMedia/include/SimpleRTPSink.hh - src/lib/live555/liveMedia/include/SimpleRTPSource.hh - src/lib/live555/UsageEnvironment/include/Boolean.hh - src/lib/live555/UsageEnvironment/include/HashTable.hh - src/lib/live555/UsageEnvironment/include/strDup.hh - src/lib/live555/UsageEnvironment/include/UsageEnvironment.hh - src/lib/live555/UsageEnvironment/include/UsageEnvironment_version.hh -) -source_group("Header Files\\lib\\live555" FILES ${LIVE555_HEADERS}) - # Make sure that CMake adds all files to the MSVC project -list(APPEND MPTV_SOURCES ${MPTV_HEADERS} ${TSREADER_SOURCES} ${TSREADER_HEADERS} ${LIVE555_SOURCES} ${LIVE555_HEADERS}) +list(APPEND MPTV_SOURCES ${MPTV_HEADERS} ${TSREADER_SOURCES} ${TSREADER_HEADERS}) set(DEPLIBS ${TINYXML_LIBRARIES}) -- 2.28.0