mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-30 12:28:59 +08:00
25382e39f7
* [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>
36 lines
1.2 KiB
Diff
36 lines
1.2 KiB
Diff
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -2348,7 +2348,6 @@
|
|
execute_process(COMMAND sh ${SDL2_SOURCE_DIR}/build-scripts/updaterev.sh
|
|
WORKING_DIRECTORY ${SDL2_BINARY_DIR})
|
|
endif()
|
|
-if(NOT WINDOWS OR CYGWIN OR MINGW)
|
|
|
|
set(prefix ${CMAKE_INSTALL_PREFIX})
|
|
|
|
@@ -2375,7 +2375,7 @@
|
|
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)
|
|
@@ -2403,7 +2403,6 @@
|
|
"${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})
|
|
@@ -2728,6 +2728,7 @@
|
|
# TODO: what about the .spec file? Is it only needed for RPM creation?
|
|
install(FILES "${SDL2_SOURCE_DIR}/sdl2.m4" DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/aclocal")
|
|
endif()
|
|
+install(FILES ${SDL2_BINARY_DIR}/sdl2.pc DESTINATION "lib${LIB_SUFFIX}/pkgconfig")
|
|
|
|
##### Uninstall target #####
|
|
|