mirror of
https://github.com/Lime3DS/Lime3DS.git
synced 2024-11-26 19:44:16 +01:00
externals: Update sdl from 2.30.5 to 2.30.6
This commit is contained in:
parent
eedbd028c0
commit
3ab0cb87bb
@ -8,9 +8,14 @@ cmake_policy(SET CMP0069 NEW)
|
|||||||
# Honor visibility properties for all targets
|
# Honor visibility properties for all targets
|
||||||
# Set the default so subdirectory cmake_minimum_required calls won't unset the policy.
|
# Set the default so subdirectory cmake_minimum_required calls won't unset the policy.
|
||||||
cmake_policy(SET CMP0063 NEW)
|
cmake_policy(SET CMP0063 NEW)
|
||||||
|
set(CMAKE_POLICY_DEFAULT_CMP0063 NEW)
|
||||||
|
# Needed to compile sdl2 2.30.5+ on MSVC
|
||||||
|
set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
|
||||||
|
# Allow use with targets in other directories
|
||||||
|
cmake_policy(SET CMP0079 NEW)
|
||||||
|
set(CMAKE_POLICY_DEFAULT_CMP0079 NEW)
|
||||||
# Allow conditions to be used in cmake_dependent_option
|
# Allow conditions to be used in cmake_dependent_option
|
||||||
cmake_policy(SET CMP0127 NEW)
|
cmake_policy(SET CMP0127 NEW)
|
||||||
set(CMAKE_POLICY_DEFAULT_CMP0063 NEW)
|
|
||||||
|
|
||||||
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules")
|
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules")
|
||||||
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/externals/cmake-modules")
|
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/externals/cmake-modules")
|
||||||
|
3
externals/CMakeLists.txt
vendored
3
externals/CMakeLists.txt
vendored
@ -185,6 +185,9 @@ add_subdirectory(teakra EXCLUDE_FROM_ALL)
|
|||||||
|
|
||||||
# SDL2
|
# SDL2
|
||||||
if (ENABLE_SDL2 AND NOT USE_SYSTEM_SDL2)
|
if (ENABLE_SDL2 AND NOT USE_SYSTEM_SDL2)
|
||||||
|
if (MSVC)
|
||||||
|
set (SDL_LIBC ON)
|
||||||
|
endif()
|
||||||
add_subdirectory(sdl2)
|
add_subdirectory(sdl2)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
2
externals/sdl2/SDL
vendored
2
externals/sdl2/SDL
vendored
@ -1 +1 @@
|
|||||||
Subproject commit 2eef7ca475decd2b864214cdbfe72b143b16d459
|
Subproject commit ba2f78a0069118a6c583f1fbf1420144ffa35bad
|
Loading…
Reference in New Issue
Block a user