Pull in jlog

This commit is contained in:
2024-08-29 21:21:48 -05:00
parent 3758e9bc03
commit 84fde1aff4
2 changed files with 12 additions and 3 deletions

View File

@@ -20,6 +20,11 @@ CPMAddPackage(
URL https://git.redacted.cc/josh/Event/archive/Release-11.zip
)
CPMAddPackage(
NAME jlog
URL https://git.redacted.cc/josh/jlog/archive/Prerelease-15.zip
)
if (PROJECT_SOURCE_DIR STREQUAL PROJECT_BINARY_DIR)
message(FATAL_ERROR "In-Source builds are not allowed")
endif()
@@ -35,7 +40,7 @@ if(WIN32)
file(GLOB_RECURSE SOURCES "src/shared/*.cpp" "src/windows/*.cpp")
endif()
include_directories("include" ${uuid_SOURCE_DIR}/include)
include_directories("include")
add_library(ReMixer ${SOURCES}
src/linux/PulseSubsystem.cpp
@@ -45,8 +50,13 @@ add_executable(ReMixer-Test main.cpp)
set_target_properties(ReMixer PROPERTIES LINKER_LANGUAGE CXX)
set_target_properties(ReMixer-Test PROPERTIES LINKER_LANGUAGE CXX)
target_include_directories(ReMixer PUBLIC ${uuid_SOURCE_DIR}/include)
target_include_directories(ReMixer PUBLIC ${Event_SOURCE_DIR}/include)
target_link_libraries(ReMixer PUBLIC Event)
target_include_directories(ReMixer PUBLIC ${jlog_SOURCE_DIR}/include)
target_link_libraries(ReMixer PUBLIC Event jlog)
if(UNIX AND NOT APPLE)
target_link_libraries(ReMixer PUBLIC vorbisfile vorbis pulse-simple pulse uuid)

View File

@@ -28,7 +28,6 @@
PulseAudioSubsystem test = PulseAudioSubsystem("PulseAudio Test");
PulseStream test_stream = test.CreateStream("Test Stream");
PulseStream test_stream2 = test.CreateStream("Another Test Stream");