mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-28 05:27:51 +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
36 lines
1.2 KiB
Diff
36 lines
1.2 KiB
Diff
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -2555,7 +2555,6 @@ endif()
|
|
configure_file("${SDL2_SOURCE_DIR}/include/SDL_revision.h.cmake"
|
|
"${SDL2_BINARY_DIR}/include/SDL_revision.h")
|
|
|
|
-if(NOT WINDOWS OR CYGWIN OR MINGW)
|
|
|
|
set(prefix ${CMAKE_INSTALL_PREFIX})
|
|
|
|
@@ -2590,7 +2590,7 @@ Libs.private:")
|
|
set(SDL_STATIC_LIBS ${_SDL_STATIC_LIBS})
|
|
listtostrrev(SDL_LIBS _SDL_LIBS)
|
|
set(SDL_LIBS ${_SDL_LIBS})
|
|
- else()
|
|
+ elseif(NOT WINDOWS_STORE)
|
|
listtostr(EXTRA_LIBS _EXTRA_LIBS "-l")
|
|
set(SDL_STATIC_LIBS ${SDL_LIBS} ${EXTRA_LDFLAGS} ${_EXTRA_LIBS})
|
|
list(REMOVE_DUPLICATES SDL_STATIC_LIBS)
|
|
@@ -2611,7 +2611,6 @@ Libs.private:")
|
|
"${SDL2_BINARY_DIR}/sdl2-config" @ONLY)
|
|
configure_file("${SDL2_SOURCE_DIR}/SDL2.spec.in"
|
|
"${SDL2_BINARY_DIR}/SDL2.spec" @ONLY)
|
|
-endif()
|
|
|
|
macro(check_add_debug_flag FLAG SUFFIX)
|
|
check_c_compiler_flag(${FLAG} HAS_C_FLAG_${SUFFIX})
|
|
@@ -2956,6 +2956,7 @@ if(NOT (WINDOWS OR CYGWIN) OR MINGW)
|
|
# TODO: what about the .spec file? Is it only needed for RPM creation?
|
|
install(FILES "${SDL2_SOURCE_DIR}/sdl2.m4" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/aclocal")
|
|
endif()
|
|
+install(FILES ${SDL2_BINARY_DIR}/sdl2.pc DESTINATION "lib${LIB_SUFFIX}/pkgconfig")
|
|
|
|
##### Uninstall target #####
|
|
|
|
|