From 3cf06e75e309c5b029fd7843d89fca1a45430298 Mon Sep 17 00:00:00 2001 From: Darren VanBuren Date: Wed, 8 Mar 2017 04:11:11 -0800 Subject: [PATCH] Make more headway on getting things to compile Also learned stuff about CMake, this ability to have multiple executables in single CMake file, and added hopefully just the first of some common source files definitions --- .idea/misc.xml | 4 ++++ CMakeLists.txt | 42 ++++++++++++++++++++++++++++++++++++------ 2 files changed, 40 insertions(+), 6 deletions(-) create mode 100644 .idea/misc.xml diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..79b3c94 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 22c9786..4577287 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -312,7 +312,6 @@ set(DSS_SOURCE_FILES QTFileLib/QTRTPFile.h QTFileLib/QTTrack.cpp QTFileLib/QTTrack.h - QTFileTools/QTFileTest.tproj/QTFileTest.cpp QTFileTools/QTRTPFileTest.tproj/QTRTPFileTest.cpp QTFileTools/QTRTPGen.tproj/QTRTPGen.cpp QTFileTools/QTSampleLister.tproj/QTSampleLister.cpp @@ -346,7 +345,7 @@ set(DSS_SOURCE_FILES RTSPClientLib/RTPPacket.h RTSPClientLib/RTSPClient.cpp RTSPClientLib/RTSPClient.h - SafeStdLib/DynamicModuleStdLib.cpp +# SafeStdLib/DynamicModuleStdLib.cpp SafeStdLib/InternalStdLib.cpp Server.tproj/GenerateXMLPrefs.cpp Server.tproj/GenerateXMLPrefs.h @@ -433,6 +432,7 @@ set(DSS_SOURCE_FILES revision.h) add_executable(DarwinStreamingServer ${DSS_SOURCE_FILES}) +target_link_libraries(DarwinStreamingServer pthread crypt dl m stdc++) add_executable(StreamingLoadTool StreamingLoadTool/StreamingLoadTool.cpp) @@ -495,9 +495,39 @@ add_executable(MP3Broadcaster ${MP3_BROADCASTER_SOURCE_FILES}) add_executable(QTBroadcaster QTFileTools/QTBroadcaster.tproj/QTBroadcaster.cpp) -set(QTFILEINFO_SOURCE_FILES +set(QTFILELIB_COMMON_SOURCE_FILES + SafeStdLib/InternalStdLib.cpp + CommonUtilitiesLib/DateTranslator.cpp + CommonUtilitiesLib/MyAssert.cpp + CommonUtilitiesLib/OS.cpp + CommonUtilitiesLib/OSCond.cpp + CommonUtilitiesLib/OSFileSource.cpp + CommonUtilitiesLib/OSMutex.cpp + CommonUtilitiesLib/OSQueue.cpp + CommonUtilitiesLib/StringParser.cpp + CommonUtilitiesLib/StrPtrLen.cpp + RTPMetaInfoLib/RTPMetaInfoPacket.cpp + QTFileLib/QTAtom.cpp + QTFileLib/QTAtom_dref.cpp + QTFileLib/QTAtom_elst.cpp + QTFileLib/QTAtom_hinf.cpp + QTFileLib/QTAtom_mdhd.cpp + QTFileLib/QTAtom_mvhd.cpp + QTFileLib/QTAtom_stco.cpp + QTFileLib/QTAtom_stsc.cpp + QTFileLib/QTAtom_stsd.cpp + QTFileLib/QTAtom_stss.cpp + QTFileLib/QTAtom_stsz.cpp + QTFileLib/QTAtom_stts.cpp + QTFileLib/QTAtom_tkhd.cpp + QTFileLib/QTAtom_tref.cpp QTFileLib/QTFile.cpp - QTFileLib/QTFile.h - QTFileTools/QTFileInfo.tproj/QTFileInfo.cpp) + QTFileLib/QTHintTrack.cpp + QTFileLib/QTTrack.cpp + QTFileLib/QTFile_FileControlBlock.cpp) -add_executable(QTFileInfo ${QTFILEINFO_SOURCE_FILES}) \ No newline at end of file +add_executable(QTFileInfo ${QTFILELIB_COMMON_SOURCE_FILES} QTFileTools/QTFileInfo.tproj/QTFileInfo.cpp) +target_link_libraries(QTFileInfo pthread) + +add_executable(QTFileTest ${QTFILELIB_COMMON_SOURCE_FILES} QTFileTools/QTFileTest.tproj/QTFileTest.cpp) +target_link_libraries(QTFileTest pthread) \ No newline at end of file