mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-29 05:21:39 +08:00
9eb76edabf
* [freetype2] Update to 2.11.1 * [harfbuzz] Update to 3.2.0 * [sdl2] Update to 2.0.20 * [ffmpeg] Update to 5.0 * Update versions. * [ffmpeg] Remove all avresample * Update ffmpeg.json * Update ffmpeg.json * Update ffmpeg.json * Revert "[ffmpeg] Update to 5.0" This reverts commitd4f718e882. * Revert "[ffmpeg] Remove all avresample" This reverts commitf1fecaa8cf. * update * fix revert. * [sdl2] Fix uwp build. * Update sdl2.json
35 lines
911 B
Diff
35 lines
911 B
Diff
--- a/SDL2Config.cmake
|
|
+++ b/SDL2Config.cmake
|
|
@@ -46,6 +46,7 @@ foreach(prop ${relprops})
|
|
endif()
|
|
endforeach()
|
|
|
|
+if(NOT WINDOWS_STORE)
|
|
foreach(prop ${relprops})
|
|
get_target_property(sdl2mainimplib SDL2::SDL2main ${prop})
|
|
if(sdl2mainimplib)
|
|
@@ -53,6 +54,7 @@ foreach(prop ${relprops})
|
|
break()
|
|
endif()
|
|
endforeach()
|
|
+endif()
|
|
|
|
foreach(prop ${dbgprops})
|
|
get_target_property(sdl2implibdbg SDL2::SDL2 ${prop})
|
|
@@ -62,6 +64,7 @@ foreach(prop ${dbgprops})
|
|
endif()
|
|
endforeach()
|
|
|
|
+if(NOT WINDOWS_STORE)
|
|
foreach(prop ${dbgprops})
|
|
get_target_property(sdl2mainimplibdbg SDL2::SDL2main ${prop})
|
|
if(sdl2mainimplibdbg)
|
|
@@ -69,6 +72,7 @@ foreach(prop ${dbgprops})
|
|
break()
|
|
endif()
|
|
endforeach()
|
|
+endif()
|
|
|
|
if( sdl2implib AND sdl2mainimplib AND sdl2implibdbg AND sdl2mainimplibdbg )
|
|
# we have both release and debug builds of SDL2 and SDL2main, so use this ugly
|