| 1 |
From 9133bd8747eb9c3a9e844af72b07f86a3024d7ae Mon Sep 17 00:00:00 2001 |
| 2 |
From: Balint Reczey <[email protected]> |
| 3 |
Date: Fri, 4 Nov 2016 16:37:59 +0100 |
| 4 |
Subject: [PATCH] Get rid of embedded live555 |
| 5 |
|
| 6 |
--- |
| 7 |
CMakeLists.txt | 99 +------------------------------------------------- |
| 8 |
1 file changed, 1 insertion(+), 98 deletions(-) |
| 9 |
|
| 10 |
diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 11 |
index f612570..cb8c807 100644 |
| 12 |
--- a/CMakeLists.txt |
| 13 |
+++ b/CMakeLists.txt |
| 14 |
@@ -20,11 +20,8 @@ include_directories(${TINYXML_INCLUDE_DIR} |
| 15 |
${KODI_INCLUDE_DIR}/.. # Hack way with "/..", need bigger Kodi cmake rework to match right include ways |
| 16 |
${PROJECT_SOURCE_DIR}/src |
| 17 |
${PROJECT_BINARY_DIR} |
| 18 |
- ${LIVE555_INCLUDE_DIR} |
| 19 |
) |
| 20 |
|
| 21 |
-add_definitions(-D__STDC_FORMAT_MACROS ${LIVE555_DEFINES}) |
| 22 |
- |
| 23 |
if (NOT WIN32) |
| 24 |
add_options(ALL_LANGUAGES ALL_BUILDS "-fPIC") |
| 25 |
endif() |
| 26 |
@@ -130,102 +127,8 @@ set(TSREADER_HEADERS src/lib/tsreader/ChannelInfo.h |
| 27 |
src/lib/tsreader/TSReader.h) |
| 28 |
source_group("Header Files\\lib\\tsreader" FILES ${TSREADER_HEADERS}) |
| 29 |
|
| 30 |
-#Live555 subset sources |
| 31 |
-SET(LIVE555_SOURCES |
| 32 |
- src/lib/live555/BasicUsageEnvironment/BasicHashTable.cpp |
| 33 |
- src/lib/live555/BasicUsageEnvironment/BasicTaskScheduler.cpp |
| 34 |
- src/lib/live555/BasicUsageEnvironment/BasicTaskScheduler0.cpp |
| 35 |
- src/lib/live555/BasicUsageEnvironment/BasicUsageEnvironment.cpp |
| 36 |
- src/lib/live555/BasicUsageEnvironment/BasicUsageEnvironment0.cpp |
| 37 |
- src/lib/live555/BasicUsageEnvironment/DelayQueue.cpp |
| 38 |
- src/lib/live555/UsageEnvironment/HashTable.cpp |
| 39 |
- src/lib/live555/UsageEnvironment/UsageEnvironment.cpp |
| 40 |
- src/lib/live555/UsageEnvironment/strDup.cpp |
| 41 |
- src/lib/live555/groupsock/GroupEId.cpp |
| 42 |
- src/lib/live555/groupsock/Groupsock.cpp |
| 43 |
- src/lib/live555/groupsock/GroupsockHelper.cpp |
| 44 |
- src/lib/live555/groupsock/IOHandlers.cpp |
| 45 |
- src/lib/live555/groupsock/NetAddress.cpp |
| 46 |
- src/lib/live555/groupsock/NetInterface.cpp |
| 47 |
- src/lib/live555/groupsock/inet.c |
| 48 |
- src/lib/live555/liveMedia/Base64.cpp |
| 49 |
- src/lib/live555/liveMedia/BasicUDPSource.cpp |
| 50 |
- src/lib/live555/liveMedia/DigestAuthentication.cpp |
| 51 |
- src/lib/live555/liveMedia/FramedFilter.cpp |
| 52 |
- src/lib/live555/liveMedia/FramedSource.cpp |
| 53 |
- src/lib/live555/liveMedia/Locale.cpp |
| 54 |
- src/lib/live555/liveMedia/MPEG2TransportStreamFramer.cpp |
| 55 |
- src/lib/live555/liveMedia/Media.cpp |
| 56 |
- src/lib/live555/liveMedia/MediaSession.cpp |
| 57 |
- src/lib/live555/liveMedia/MediaSink.cpp |
| 58 |
- src/lib/live555/liveMedia/MediaSource.cpp |
| 59 |
- src/lib/live555/liveMedia/MultiFramedRTPSink.cpp |
| 60 |
- src/lib/live555/liveMedia/MultiFramedRTPSource.cpp |
| 61 |
- src/lib/live555/liveMedia/RTCP.cpp |
| 62 |
- src/lib/live555/liveMedia/RTPInterface.cpp |
| 63 |
- src/lib/live555/liveMedia/RTPSink.cpp |
| 64 |
- src/lib/live555/liveMedia/RTPSource.cpp |
| 65 |
- src/lib/live555/liveMedia/RTSPClient.cpp |
| 66 |
- src/lib/live555/liveMedia/RTSPCommon.cpp |
| 67 |
- src/lib/live555/liveMedia/SimpleRTPSink.cpp |
| 68 |
- src/lib/live555/liveMedia/SimpleRTPSource.cpp |
| 69 |
- src/lib/live555/liveMedia/our_md5.c |
| 70 |
- src/lib/live555/liveMedia/our_md5hl.c |
| 71 |
- src/lib/live555/liveMedia/rtcp_from_spec.c |
| 72 |
-) |
| 73 |
-source_group("Source Files\\lib\\live555" FILES ${LIVE555_SOURCES}) |
| 74 |
- |
| 75 |
-SET(LIVE555_HEADERS |
| 76 |
- src/lib/live555/groupsock/include/NetCommon.h |
| 77 |
- src/lib/live555/liveMedia/our_md5.h |
| 78 |
- src/lib/live555/liveMedia/rtcp_from_spec.h |
| 79 |
- src/lib/live555/BasicUsageEnvironment/include/BasicHashTable.hh |
| 80 |
- src/lib/live555/BasicUsageEnvironment/include/BasicUsageEnvironment.hh |
| 81 |
- src/lib/live555/BasicUsageEnvironment/include/BasicUsageEnvironment0.hh |
| 82 |
- src/lib/live555/BasicUsageEnvironment/include/BasicUsageEnvironment_version.hh |
| 83 |
- src/lib/live555/BasicUsageEnvironment/include/DelayQueue.hh |
| 84 |
- src/lib/live555/BasicUsageEnvironment/include/HandlerSet.hh |
| 85 |
- src/lib/live555/groupsock/include/GroupEId.hh |
| 86 |
- src/lib/live555/groupsock/include/Groupsock.hh |
| 87 |
- src/lib/live555/groupsock/include/GroupsockHelper.hh |
| 88 |
- src/lib/live555/groupsock/include/groupsock_version.hh |
| 89 |
- src/lib/live555/groupsock/include/IOHandlers.hh |
| 90 |
- src/lib/live555/groupsock/include/NetAddress.hh |
| 91 |
- src/lib/live555/groupsock/include/NetInterface.hh |
| 92 |
- src/lib/live555/groupsock/include/TunnelEncaps.hh |
| 93 |
- src/lib/live555/liveMedia/include/Base64.hh |
| 94 |
- src/lib/live555/liveMedia/include/BasicUDPSource.hh |
| 95 |
- src/lib/live555/liveMedia/include/DigestAuthentication.hh |
| 96 |
- src/lib/live555/liveMedia/include/FramedFilter.hh |
| 97 |
- src/lib/live555/liveMedia/include/FramedSource.hh |
| 98 |
- src/lib/live555/liveMedia/include/liveMedia.hh |
| 99 |
- src/lib/live555/liveMedia/include/liveMedia_version.hh |
| 100 |
- src/lib/live555/liveMedia/include/Locale.hh |
| 101 |
- src/lib/live555/liveMedia/include/Media.hh |
| 102 |
- src/lib/live555/liveMedia/include/MediaSession.hh |
| 103 |
- src/lib/live555/liveMedia/include/MediaSink.hh |
| 104 |
- src/lib/live555/liveMedia/include/MediaSource.hh |
| 105 |
- src/lib/live555/liveMedia/include/MPEG2TransportStreamFramer.hh |
| 106 |
- src/lib/live555/liveMedia/include/MultiFramedRTPSink.hh |
| 107 |
- src/lib/live555/liveMedia/include/MultiFramedRTPSource.hh |
| 108 |
- src/lib/live555/liveMedia/include/RTCP.hh |
| 109 |
- src/lib/live555/liveMedia/include/RTPInterface.hh |
| 110 |
- src/lib/live555/liveMedia/include/RTPSink.hh |
| 111 |
- src/lib/live555/liveMedia/include/RTPSource.hh |
| 112 |
- src/lib/live555/liveMedia/include/RTSPClient.hh |
| 113 |
- src/lib/live555/liveMedia/include/RTSPCommon.hh |
| 114 |
- src/lib/live555/liveMedia/include/SimpleRTPSink.hh |
| 115 |
- src/lib/live555/liveMedia/include/SimpleRTPSource.hh |
| 116 |
- src/lib/live555/UsageEnvironment/include/Boolean.hh |
| 117 |
- src/lib/live555/UsageEnvironment/include/HashTable.hh |
| 118 |
- src/lib/live555/UsageEnvironment/include/strDup.hh |
| 119 |
- src/lib/live555/UsageEnvironment/include/UsageEnvironment.hh |
| 120 |
- src/lib/live555/UsageEnvironment/include/UsageEnvironment_version.hh |
| 121 |
-) |
| 122 |
-source_group("Header Files\\lib\\live555" FILES ${LIVE555_HEADERS}) |
| 123 |
- |
| 124 |
# Make sure that CMake adds all files to the MSVC project |
| 125 |
-list(APPEND MPTV_SOURCES ${MPTV_HEADERS} ${TSREADER_SOURCES} ${TSREADER_HEADERS} ${LIVE555_SOURCES} ${LIVE555_HEADERS}) |
| 126 |
+list(APPEND MPTV_SOURCES ${MPTV_HEADERS} ${TSREADER_SOURCES} ${TSREADER_HEADERS}) |
| 127 |
|
| 128 |
set(DEPLIBS ${TINYXML_LIBRARIES}) |
| 129 |
|
| 130 |
-- |
| 131 |
2.28.0 |
| 132 |
|