Compile ADP as part of MeterForPulseAudio

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ecd3a1354859772e57821bb82f6950266c17ac93..8dacd7eac7cd001834cda3fc5423689dbf51ead3 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,9 +1,12 @@
 cmake_minimum_required(VERSION 3.0)
 
-project(MeterForPulseAudio VERSION 1.7)
+project(MeterForPulseAudio VERSION 1.8)
 
 set(MeterForPulseAudio_SOURCES
     GameDevTools/src/GDT/GameLoop.cpp
+    AnotherDangParser/src/ADP/AnotherDangParser.cpp
+    AnotherDangParser/src/ADP/HelpInfo.cpp
+    AnotherDangParser/src/ADP/OptionFlag.cpp
     src/Main.cpp
     src/MfPA/Meter.cpp
     src/MfPA/GetSinkSourceInfo.cpp
@@ -50,9 +53,7 @@ target_include_directories(MeterForPulseAudio PUBLIC ${PULSEAUDIO_INCLUDE_DIR})
 target_link_libraries(MeterForPulseAudio PUBLIC ${PULSEAUDIO_LIBRARY})
 
 # add sub-project AnotherDangParser
-add_subdirectory(AnotherDangParser)
 target_include_directories(MeterForPulseAudio PUBLIC AnotherDangParser/src)
-target_link_libraries(MeterForPulseAudio PUBLIC AnotherDangParser)
 
 # add parts of sub-project GameDevTools
 target_include_directories(MeterForPulseAudio PUBLIC GameDevTools/src)

diff --git a/Changelog.md b/Changelog.md
index 761647e131966ca2a459b7745764fedfeca9ef67..09b0f93b41a7351e84592465f0b4a6161b334002 100644 (file)
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,8 @@
+# Version 1.8
+
+Compile AnotherDangParser as part of MeterForPulseAudio instead of compiling it
+as a separate library.
+
 # Version 1.7
 
 Fix listing sinks/sources to halt even when querying failed (previously, only