Bump SDL to 2.24.0

jorio · Sep 11, 2022 · c928b87 · c928b87
1 parent c42e0f6
commit c928b87
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/BUILD.md b/BUILD.md
@@ -15,7 +15,7 @@ build.py is the script that is used by the CI setup to produce builds. If you wa
     ```
     git clone --recurse-submodules https://github.com/jorio/Bugdom
     ```
-1. Download [SDL2-2.0.22.dmg](https://libsdl.org/release/SDL2-2.0.22.dmg), open it, and copy **SDL2.framework** to the **extern** folder
+1. Download [SDL2-2.24.0.dmg](https://libsdl.org/release/SDL2-2.24.0.dmg), open it, and copy **SDL2.framework** to the **extern** folder
 1. Prep the Xcode project:
     ```
     cmake -G Xcode -S . -B build
@@ -35,7 +35,7 @@ build.py is the script that is used by the CI setup to produce builds. If you wa
     ```
     git clone --recurse-submodules https://github.com/jorio/Bugdom
     ```
-1. Download [SDL2-devel-2.0.22-VC.zip](https://libsdl.org/release/SDL2-devel-2.0.22-VC.zip) and extract the contents into the **extern** folder
+1. Download [SDL2-devel-2.24.0-VC.zip](https://libsdl.org/release/SDL2-devel-2.24.0-VC.zip) and extract the contents into the **extern** folder
 1. Prep the Visual Studio solution:
     ```
     cmake -G "Visual Studio 17 2022" -A x64 -S . -B build

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -43,6 +43,10 @@ if(MSVC)
 	add_compile_definitions(UNICODE _UNICODE)
 
 	set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT ${GAME_TARGET})
+elseif(APPLE)
+	# Let the game (and Pomme) find header files within SDL2.framework
+	set(CMAKE_XCODE_ATTRIBUTE_FRAMEWORK_SEARCH_PATHS extern)
+	add_compile_options("-F${CMAKE_SOURCE_DIR}/extern")  # for non-xcode IDEs
 endif()
 
 set(POMME_NO_VIDEO true)

diff --git a/build.py b/build.py
@@ -28,13 +28,13 @@
 
 source_check        = "src/Enemies/Enemy_WorkerBee.c"  # some file that's likely to be from the game's source tree
 
-sdl_ver             = "2.0.22"
+sdl_ver             = "2.24.0"
 appimagetool_ver    = "13"
 
 lib_hashes = {  # sha-256
-    "SDL2-2.0.22.tar.gz":            "fe7cbf3127882e3fc7259a75a0cb585620272c51745d3852ab9dd87960697f2e",
-    "SDL2-2.0.22.dmg":               "72974672b8359057aa2f6d467c8adae8182a6caedd660e3936e23c3c683c3801",
-    "SDL2-devel-2.0.22-VC.zip":      "32adc96d8b25e5671189f1f38a4fc7deb105fbb1b3ed78ffcb23f5b8f36b3922",
+    "SDL2-2.24.0.tar.gz":            "91e4c34b1768f92d399b078e171448c6af18cafda743987ed2064a28954d6d97",
+    "SDL2-2.24.0.dmg":               "c3f3315d07372f261cf8393767799e84b7b81b232fa2317629ad1a624493e7bd",
+    "SDL2-devel-2.24.0-VC.zip":      "97c6e2d17c0baebf4c84ede27ec42e211358f3694b9f558ead3a9c542c4a004e",
     "appimagetool-x86_64.AppImage":  "df3baf5ca5facbecfc2f3fa6713c29ab9cefa8fd8c1eac5d283b79cab33e4acb", # appimagetool v13
     "appimagetool-aarch64.AppImage": "334e77beb67fc1e71856c29d5f3f324ca77b0fde7a840fdd14bd3b88c25c341f",
 }

diff --git a/cmake/FindSDL2.cmake b/cmake/FindSDL2.cmake
@@ -9,7 +9,7 @@
 
 include(FindPackageHandleStandardArgs)
 
-set(SDL2_VERSION 2.0.22)
+set(SDL2_VERSION 2.24.0)
 
 # Check if "main" was specified as a component
 set(_SDL2_use_main FALSE)