From 76754e6f89986cb32a3b84c5dcb3c2f8060d77f1 Mon Sep 17 00:00:00 2001 From: Stephen Seo Date: Mon, 20 Aug 2018 15:31:33 +0900 Subject: [PATCH] Compile ADP as part of MeterForPulseAudio --- CMakeLists.txt | 7 ++++--- Changelog.md | 5 +++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ecd3a13..8dacd7e 100644 --- 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 761647e..09b0f93 100644 --- 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 -- 2.49.0