3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-04-29 02:07:55 +02:00
Code Issues Projects Releases Packages Wiki Activity

reorder ogg and vorbis library linking

Browse source 
if vorbis has been built to depend of ogg, when trying to
statically link, the build of snapclient and snapserver fail.

reorder the libraries, to allow off symbols in vorbis to be
resolved.
This commit is contained in:
Rudi Heitbaum 2024-04-14 16:02:18 +00:00 • committed by Johannes Pohl
parent 245921009e
commit 5fa01b8a49
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
client/CMakeLists.txt
View file

@ -76,13 +76,6 @@ if(ANDROID)
list(APPEND CLIENT_LIBRARIES OpenSLES)
else()
# if OGG then tremor or vorbis
if(OGG_FOUND)
list(APPEND CLIENT_SOURCES decoder/ogg_decoder.cpp)
list(APPEND CLIENT_LIBRARIES ${OGG_LIBRARIES})
list(APPEND CLIENT_INCLUDE ${OGG_INCLUDE_DIRS})
endif(OGG_FOUND)
# Tremor (fixed-point) or libvorbis (floating-point)
if(TREMOR_FOUND)
list(APPEND CLIENT_LIBRARIES ${TREMOR_LIBRARIES})
@ -92,6 +85,13 @@ else()
list(APPEND CLIENT_INCLUDE ${VORBIS_INCLUDE_DIRS})
endif(TREMOR_FOUND)
# if OGG then tremor or vorbis
if(OGG_FOUND)
list(APPEND CLIENT_SOURCES decoder/ogg_decoder.cpp)
list(APPEND CLIENT_LIBRARIES ${OGG_LIBRARIES})
list(APPEND CLIENT_INCLUDE ${OGG_INCLUDE_DIRS})
endif(OGG_FOUND)
if(FLAC_FOUND)
list(APPEND CLIENT_SOURCES decoder/flac_decoder.cpp)
list(APPEND CLIENT_LIBRARIES ${FLAC_LIBRARIES})

4
server/CMakeLists.txt
View file

@ -64,8 +64,8 @@ else()
AND VORBIS_FOUND
AND VORBISENC_FOUND)
list(APPEND SERVER_SOURCES encoder/ogg_encoder.cpp)
list(APPEND SERVER_LIBRARIES ${OGG_LIBRARIES} ${VORBIS_LIBRARIES}
${VORBISENC_LIBRARIES})
list(APPEND SERVER_LIBRARIES ${VORBIS_LIBRARIES} ${VORBISENC_LIBRARIES}
${OGG_LIBRARIES})
list(APPEND SERVER_INCLUDE ${OGG_INCLUDE_DIRS} ${VORBIS_INCLUDE_DIRS}
${VORBISENC_INCLUDE_DIRS})
endif(