mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-04 07:41:47 +08:00
785cbdb8ba
* [sdl2-mixer] Bump to version 2.6.3 * [sdl2-mixer] Fix findFluidSynth on windows-static. * [sdl2-mixer] vcpkg_minimum_required is not needed * [sdl2-mixer] Control SDL2MIXER_MOD with libmodplug If SDL2MIXER_MOD is left on when no backend is availble, CMake issues a warning. * [sdl2-mixer] Turn off SDL2MIXER_DEPS_SHARED Similar issue to #28137. SDL2MIXER_OPUS_SHARED and SDL2MIXER_VORBIS_VORBISFILE_SHARED need to be manually turned off as they are unconditionally turned on. * [sdl2-mixer] Set the correct vorbis backend. Even when SDL2MIXER_VORBIS_VORBISFILE was set to ON, stb_vorbis would be used as the default backend. * [sdl2-mixer] Use vcpkg_install_copyright * [sdl2-mixer] Ensure flac and mpg123 are selected. Turn off header-only libraries when the features are selected. * [sdl2-mixer] Patch missing call to find_dependency This is fixed upstream but has not been included in the 2.6.x branch. * [sdl2-mixer] Fix dependency linking. - The FLAC target is an upstream patch. - VCPKG's opusfile port is static-only, meaning Opus and Ogg needs to be linked explicitly. * [sdl2-mixer] Update baseline. --------- Co-authored-by: MonicaLiu <v-liumonica@microsoft.com>
34 lines
1013 B
Diff
34 lines
1013 B
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 54317572..4fcd92d5 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -323,6 +323,9 @@ if(SDL2MIXER_OGG)
|
|
if(SDL2MIXER_OGG_install)
|
|
list(APPEND INSTALL_EXTRA_TARGETS ogg)
|
|
endif()
|
|
+ else()
|
|
+ find_package(Ogg CONFIG REQUIRED)
|
|
+ target_link_libraries(SDL2_mixer PRIVATE Ogg::ogg)
|
|
endif()
|
|
endif()
|
|
|
|
@@ -384,7 +387,8 @@ if(SDL2MIXER_OPUS)
|
|
add_dependencies(SDL2_mixer opusfile::opusfile)
|
|
endif()
|
|
else()
|
|
- target_link_libraries(SDL2_mixer PRIVATE opusfile::opusfile)
|
|
+ find_package(Opus CONFIG REQUIRED)
|
|
+ target_link_libraries(SDL2_mixer PRIVATE opusfile::opusfile Opus::opus)
|
|
endif()
|
|
endif()
|
|
|
|
@@ -528,7 +532,7 @@ if(SDL2MIXER_FLAC_LIBFLAC)
|
|
add_dependencies(SDL2_mixer FLAC)
|
|
endif()
|
|
else()
|
|
- target_link_libraries(SDL2_mixer PRIVATE FLAC)
|
|
+ target_link_libraries(SDL2_mixer PRIVATE FLAC::FLAC)
|
|
endif()
|
|
endif()
|
|
|