mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-02 06:19:06 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
ce4aaba77f
vcpkg/ports/sdl2/0001-sdl2-Enable-creation-of-pkg-cfg-file-on-windows.patch

39 lines
1.3 KiB
Diff
Raw Normal View History

[sdl2] update to 2.0.22 (#24694) * [sdl2] update to 2.0.22 * update version Co-authored-by: FrankXie <v-frankxie@microsoft.com>
2022-05-16 12:21:02 +08:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 644715a..6eacfb8 100644
[ffmpeg] Add feature support for zlib, iconv, fdk-aac, mp3lame, opus, soxr, theora. (#11277) Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com>
2020-08-19 03:58:14 +08:00
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
[sdl2] update to 2.0.22 (#24694) * [sdl2] update to 2.0.22 * update version Co-authored-by: FrankXie <v-frankxie@microsoft.com>
2022-05-16 12:21:02 +08:00
@@ -2670,8 +2670,6 @@ endif()
[ freetype2/harfbuzz/sdl2] Update to the latest version (#22586) * [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 commit d4f718e882fe022f641b68e154e8cf64776c4143. * Revert "[ffmpeg] Remove all avresample" This reverts commit f1fecaa8cfa5b7f42fbef0897312028dc88b0ec8. * update * fix revert. * [sdl2] Fix uwp build. * Update sdl2.json
2022-01-27 07:32:31 +08:00
configure_file("${SDL2_SOURCE_DIR}/include/SDL_revision.h.cmake"
"${SDL2_BINARY_DIR}/include/SDL_revision.h")
[sdl2] Update to 2.0.16 (#19509) * [sdl2] Update to 2.0.16 * [sdl2] Update version files * [sdl2] Fix uwp builds * [sdl2] Update version files * [sdl2] Change version-semver to version * [sdl2] Fix uwp pkgconfig file creation * [sdl2] Add alias on static build * [sdl2] Remove cmake wrapper * [sdl2] Update version files * [sdl2] Disable SDL2::SDL2main target search on uwp * [sdl2] Update version files Co-authored-by: Rémy Tassoux <rt2@rasterizedworld.com> Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2021-08-19 08:19:15 +08:00
-if(NOT WINDOWS OR CYGWIN OR MINGW)
[sdl2] update to 2.0.22 (#24694) * [sdl2] update to 2.0.22 * update version Co-authored-by: FrankXie <v-frankxie@microsoft.com>
2022-05-16 12:21:02 +08:00
-
[ffmpeg] Add feature support for zlib, iconv, fdk-aac, mp3lame, opus, soxr, theora. (#11277) Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com>
2020-08-19 03:58:14 +08:00
set(prefix ${CMAKE_INSTALL_PREFIX})
[sdl2] Update to 2.0.16 (#19509) * [sdl2] Update to 2.0.16 * [sdl2] Update version files * [sdl2] Fix uwp builds * [sdl2] Update version files * [sdl2] Change version-semver to version * [sdl2] Fix uwp pkgconfig file creation * [sdl2] Add alias on static build * [sdl2] Remove cmake wrapper * [sdl2] Update version files * [sdl2] Disable SDL2::SDL2main target search on uwp * [sdl2] Update version files Co-authored-by: Rémy Tassoux <rt2@rasterizedworld.com> Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2021-08-19 08:19:15 +08:00
[sdl2] update to 2.0.22 (#24694) * [sdl2] update to 2.0.22 * update version Co-authored-by: FrankXie <v-frankxie@microsoft.com>
2022-05-16 12:21:02 +08:00
set(exec_prefix "\${prefix}")
@@ -2705,7 +2703,7 @@ Libs.private:")
[sdl2] Update to 2.0.16 (#19509) * [sdl2] Update to 2.0.16 * [sdl2] Update version files * [sdl2] Fix uwp builds * [sdl2] Update version files * [sdl2] Change version-semver to version * [sdl2] Fix uwp pkgconfig file creation * [sdl2] Add alias on static build * [sdl2] Remove cmake wrapper * [sdl2] Update version files * [sdl2] Disable SDL2::SDL2main target search on uwp * [sdl2] Update version files Co-authored-by: Rémy Tassoux <rt2@rasterizedworld.com> Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2021-08-19 08:19:15 +08:00
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)
[sdl2] update to 2.0.22 (#24694) * [sdl2] update to 2.0.22 * update version Co-authored-by: FrankXie <v-frankxie@microsoft.com>
2022-05-16 12:21:02 +08:00
@@ -2726,7 +2724,6 @@ Libs.private:")
[ffmpeg] Add feature support for zlib, iconv, fdk-aac, mp3lame, opus, soxr, theora. (#11277) Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com>
2020-08-19 03:58:14 +08:00
"${SDL2_BINARY_DIR}/sdl2-config" @ONLY)
configure_file("${SDL2_SOURCE_DIR}/SDL2.spec.in"
"${SDL2_BINARY_DIR}/SDL2.spec" @ONLY)
-endif()
[sdl2] Update to 2.0.16 (#19509) * [sdl2] Update to 2.0.16 * [sdl2] Update version files * [sdl2] Fix uwp builds * [sdl2] Update version files * [sdl2] Change version-semver to version * [sdl2] Fix uwp pkgconfig file creation * [sdl2] Add alias on static build * [sdl2] Remove cmake wrapper * [sdl2] Update version files * [sdl2] Disable SDL2::SDL2main target search on uwp * [sdl2] Update version files Co-authored-by: Rémy Tassoux <rt2@rasterizedworld.com> Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2021-08-19 08:19:15 +08:00
macro(check_add_debug_flag FLAG SUFFIX)
check_c_compiler_flag(${FLAG} HAS_C_FLAG_${SUFFIX})
[sdl2] update to 2.0.22 (#24694) * [sdl2] update to 2.0.22 * update version Co-authored-by: FrankXie <v-frankxie@microsoft.com>
2022-05-16 12:21:02 +08:00
@@ -3075,6 +3072,7 @@ if(NOT SDL2_DISABLE_INSTALL)
# 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")
[ffmpeg] Add feature support for zlib, iconv, fdk-aac, mp3lame, opus, soxr, theora. (#11277) Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com>
2020-08-19 03:58:14 +08:00
endif()
##### Uninstall target #####
Reference in New Issue Copy Permalink