From 3ab0cb87bb894b554b8a3c71062c581cc6df020a Mon Sep 17 00:00:00 2001 From: Reg Tiangha Date: Thu, 1 Aug 2024 17:31:27 -0600 Subject: [PATCH] externals: Update sdl from 2.30.5 to 2.30.6 --- CMakeLists.txt | 7 ++++++- externals/CMakeLists.txt | 3 +++ externals/sdl2/SDL | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a1c06fbdd..d2fb696b5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,9 +8,14 @@ cmake_policy(SET CMP0069 NEW) # Honor visibility properties for all targets # Set the default so subdirectory cmake_minimum_required calls won't unset the policy. 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 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}/externals/cmake-modules") diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 788992d81..fec83a8c5 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -185,6 +185,9 @@ add_subdirectory(teakra EXCLUDE_FROM_ALL) # SDL2 if (ENABLE_SDL2 AND NOT USE_SYSTEM_SDL2) + if (MSVC) + set (SDL_LIBC ON) + endif() add_subdirectory(sdl2) endif() diff --git a/externals/sdl2/SDL b/externals/sdl2/SDL index 2eef7ca47..ba2f78a00 160000 --- a/externals/sdl2/SDL +++ b/externals/sdl2/SDL @@ -1 +1 @@ -Subproject commit 2eef7ca475decd2b864214cdbfe72b143b16d459 +Subproject commit ba2f78a0069118a6c583f1fbf1420144ffa35bad