Updated submodules, SDL2, and fixed warning at newer CMake versions

WohlSoft · Dec 30, 2024 · 9a166b6 · 9a166b6
1 parent bfb01cb
commit 9a166b6
Show file tree

Hide file tree

Showing 17 changed files with 19 additions and 19 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.5)
+cmake_minimum_required (VERSION 3.5...3.10)
 
 if(POLICY CMP0069) # Allow CMAKE_INTERPROCEDURAL_OPTIMIZATION (lto) to be set
     cmake_policy(SET CMP0069 NEW)

diff --git a/Editor/CMakeLists.txt b/Editor/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.5)
+cmake_minimum_required (VERSION 3.5...3.10)
 project(MoondustEditor C CXX)
 
 if(POLICY CMP0071) # Automoc

diff --git a/Engine/CMakeLists.txt b/Engine/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.5)
+cmake_minimum_required (VERSION 3.5...3.10)
 project(MoondustEngine C CXX)
 
 set(DEPENDENCIES_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR})

diff --git a/Engine/android-project/moondust/src/main/java/org/libsdl/app/SDLActivity.java b/Engine/android-project/moondust/src/main/java/org/libsdl/app/SDLActivity.java
@@ -61,7 +61,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
     private static final String TAG = "SDL";
     private static final int SDL_MAJOR_VERSION = 2;
     private static final int SDL_MINOR_VERSION = 30;
-    private static final int SDL_MICRO_VERSION = 7;
+    private static final int SDL_MICRO_VERSION = 10;
 /*
     // Display InputType.SOURCE/CLASS of events and devices
     //
@@ -89,7 +89,7 @@ public static void debugSource(int sources, String prefix) {
                 | InputDevice.SOURCE_CLASS_POSITION
                 | InputDevice.SOURCE_CLASS_TRACKBALL);
 
-        if (s2 != 0) cls += "Some_Unkown";
+        if (s2 != 0) cls += "Some_Unknown";
 
         s2 = s_copy & InputDevice.SOURCE_ANY; // keep source only, no class;
 
@@ -163,7 +163,7 @@ public static void debugSource(int sources, String prefix) {
         if (s == FLAG_TAINTED) src += " FLAG_TAINTED";
         s2 &= ~FLAG_TAINTED;
 
-        if (s2 != 0) src += " Some_Unkown";
+        if (s2 != 0) src += " Some_Unknown";
 
         Log.v(TAG, prefix + "int=" + s_copy + " CLASS={" + cls + " } source(s):" + src);
     }

diff --git a/GIFs2PNG/CMakeLists.txt b/GIFs2PNG/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.5)
+cmake_minimum_required (VERSION 3.5...3.10)
 project(MoondustGIFs2PNG C CXX)
 
 set(CMAKE_INSTALL_RPATH ".")

diff --git a/LazyFixTool/CMakeLists.txt b/LazyFixTool/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.5)
+cmake_minimum_required (VERSION 3.5...3.10)
 project(MoondustLazyFixTool C CXX)
 
 set(CMAKE_INSTALL_RPATH ".")

diff --git a/Maintainer/CMakeLists.txt b/Maintainer/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.5)
+cmake_minimum_required (VERSION 3.5...3.10)
 project(MoondustMaintainer C CXX)
 
 if(POLICY CMP0071) # Automoc

diff --git a/MusicPlayer/CMakeLists.txt b/MusicPlayer/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.5)
+cmake_minimum_required (VERSION 3.5...3.10)
 project(SDLMixerMusPlayer C CXX)
 
 if(POLICY CMP0071) # Automoc

diff --git a/PNG2GIFs/CMakeLists.txt b/PNG2GIFs/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.5)
+cmake_minimum_required (VERSION 3.5...3.10)
 project(MoondustPNG2GIFs C CXX)
 
 set(CMAKE_INSTALL_RPATH ".")

diff --git a/PaletteFilter/CMakeLists.txt b/PaletteFilter/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.5)
+cmake_minimum_required (VERSION 3.5...3.10)
 project(MoondustPaletteFilter C CXX)
 
 set(CMAKE_INSTALL_RPATH ".")

diff --git a/PlayableCalibrator/CMakeLists.txt b/PlayableCalibrator/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.5)
+cmake_minimum_required (VERSION 3.5...3.10)
 project(MoondustPlayerCalibrator C CXX)
 
 if(POLICY CMP0071) # Automoc

diff --git a/_Libs/AudioCodecs b/_Libs/AudioCodecs
diff --git a/_Libs/SDL_Mixer_X b/_Libs/SDL_Mixer_X
diff --git a/_Libs/Unix2Dos/CMakeLists.txt b/_Libs/Unix2Dos/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.8.12)
+cmake_minimum_required (VERSION 2.8.12...3.10)
 project(Unix2Dos C)
 
 # Disable bogus MSVC warnings

diff --git a/_Misc/json_to_lua/CMakeLists.txt b/_Misc/json_to_lua/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.2)
+cmake_minimum_required (VERSION 3.2...3.10)
 project (JsonToLua LANGUAGES C CXX)
 
 include(ExternalProject)

diff --git a/_common/PGE_File_Formats b/_common/PGE_File_Formats
diff --git a/_common/res_generator/CMakeLists.txt b/_common/res_generator/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.5)
+cmake_minimum_required (VERSION 3.5...3.10)
 project(ResGenerator CXX)
 
 set(CMAKE_CXX_STANDARD 11)