lauchmelder/SFML
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Update CMake integration for Opus

Browse source
This commit is contained in:
Lukas Dürrenberger 2020-11-18 20:16:37 +01:00
parent 8774acddb1
commit baa8a3f1e4
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cmake/SFMLConfigDependencies.cmake.in
View file

@ -78,6 +78,7 @@ if(SFML_STATIC_LIBRARIES)
sfml_bind_dependency(TARGET VORBIS FRIENDLY_NAME "Vorbis" SEARCH_NAMES "vorbis")
sfml_bind_dependency(TARGET VORBIS FRIENDLY_NAME "Ogg" SEARCH_NAMES "ogg")
sfml_bind_dependency(TARGET FLAC FRIENDLY_NAME "FLAC" SEARCH_NAMES "FLAC")
sfml_bind_dependency(TARGET Opus FRIENDLY_NAME "Opus" SEARCH_NAMES "Opus")
endif()
if (FIND_SFML_DEPENDENCIES_NOTFOUND)

4
src/SFML/Audio/CMakeLists.txt
View file

@ -73,7 +73,7 @@ endif()
sfml_find_package(OpenAL INCLUDE "OPENAL_INCLUDE_DIR" LINK "OPENAL_LIBRARY")
sfml_find_package(VORBIS INCLUDE "VORBIS_INCLUDE_DIRS" LINK "VORBIS_LIBRARIES")
sfml_find_package(FLAC INCLUDE "FLAC_INCLUDE_DIR" LINK "FLAC_LIBRARY")
sfml_find_package(Opus INCLUDE "OPUS_INCLUDE_DIR" LINK "OPUS_LIBRARY")
sfml_find_package(Opus INCLUDE "OPUS_INCLUDE_DIRS" LINK "OPUS_LIBRARIES")
# avoids warnings in vorbisfile.h
target_compile_definitions(VORBIS INTERFACE "OV_EXCLUDE_STATIC_CALLBACKS")
@ -92,4 +92,4 @@ endif()
target_link_libraries(sfml-audio
PUBLIC sfml-system
PRIVATE VORBIS FLAC)
PRIVATE VORBIS FLAC Opus)