SDL2 -> SDL3

Author: Pentarctagon

CMakeLists.txt

@@ -539,18 +539,9 @@ if(ENABLE_GAME OR ENABLE_TESTS)
 	find_package(VorbisFile REQUIRED)
 	find_package(PkgConfig REQUIRED)
 	find_package(Fontconfig REQUIRED)
-	find_package(SDL2 2.0.18 REQUIRED)
-	if(NOT MSVC)
-		# for everything else, use pkgconfig
-		# SDL2_image and SDL2_mixer don't seem to have any cmake configuration available at all
-		pkg_check_modules(SDL2IMAGE REQUIRED SDL2_image>=2.0.2)
-		pkg_check_modules(SDL2MIXER REQUIRED SDL2_mixer>=2.0.0)
-	else()
-		# for MSVC, vcpkg builds and provides custom SDL2-related modules for cmake to use, so use those
-		# this also fixes the issue with our previous FindSDL2* scripts incorrectly using the Release version of these libs instead of the Debug version
-		find_package(SDL2_image CONFIG REQUIRED)
-		find_package(SDL2_mixer CONFIG REQUIRED)
-	endif()
+	find_package(SDL3 REQUIRED CONFIG REQUIRED COMPONENTS SDL3)
+	find_package(SDL3_image CONFIG REQUIRED)
+	find_package(SDL3_mixer CONFIG REQUIRED)
 	pkg_check_modules(CAIRO REQUIRED cairo>=1.10)
 	pkg_check_modules(PANGOCAIRO REQUIRED pangocairo>=1.50.0)
 	pkg_check_modules(PANGO REQUIRED pango>=1.50.0)

SConstruct

@@ -373,9 +373,9 @@ if env["prereqs"]:
 
     def have_sdl_other():
         return \
-            conf.CheckSDL2('2.0.18') & \
-            conf.CheckSDL2Mixer() & \
-            conf.CheckSDL2Image()
+            conf.CheckSDL3('3.1.0') & \
+            conf.CheckSDL3Mixer() & \
+            conf.CheckSDL3Image()
 
     if sys.platform == "msys":
         env["PKG_CONFIG_FLAGS"] = "--dont-define-prefix"

cmake/FindSDL2.cmake

@@ -6,7 +6,7 @@
 from os import environ
 from SCons.Util import PrependPath
 
-def CheckSDL2(context, require_version):
+def CheckSDL3(context, require_version):
     version = require_version.split(".", 2)
     major_version = version[0]
     minor_version = version[1]
@@ -22,8 +22,8 @@ def CheckSDL2(context, require_version):
 
     if env["PLATFORM"] != "win32" or sys.platform == "msys":
         for foo_config in [
-            "pkg-config --cflags --libs $PKG_CONFIG_FLAGS sdl2",
-            "sdl2-config --cflags --libs"
+            "pkg-config --cflags --libs $PKG_CONFIG_FLAGS sdl3",
+            "sdl3-config --cflags --libs"
             ]:
             try:
                 env.ParseConfig(foo_config)
@@ -33,14 +33,14 @@ def CheckSDL2(context, require_version):
                 break
     else:
         if sdldir:
-            env.AppendUnique(CPPPATH = [os.path.join(sdldir, "include/SDL2")], LIBPATH = [os.path.join(sdldir, "lib")])
-        env.AppendUnique(CCFLAGS = ["-D_GNU_SOURCE", "-DREQ_MAJOR="+major_version, "-DREQ_MINOR="+minor_version, "-DREQ_PATCH="+patchlevel])
-        env.AppendUnique(LIBS = Split("mingw32 SDL2main SDL2"))
+            env.AppendUnique(CPPPATH = [os.path.join(sdldir, "include/SDL3")], LIBPATH = [os.path.join(sdldir, "lib")])
+        env.AppendUnique(CCFLAGS = ["-D_GNU_SOURCE"])
+        env.AppendUnique(LIBS = Split("mingw32 SDL3main SDL3"))
         env.AppendUnique(LINKFLAGS = ["-mwindows", "-fstack-protector"])
 
-    cpp_file = File("src/conftests/sdl2.cpp").rfile().abspath
+    cpp_file = File("src/conftests/sdl3.cpp").rfile().abspath
     if not os.path.isfile(cpp_file):
-        cpp_file = "src/conftests/sdl2.cpp"
+        cpp_file = "src/conftests/sdl3.cpp"
 
     with open(cpp_file, 'r') as file:
         test_program = file.read()
@@ -53,14 +53,14 @@ def CheckSDL2(context, require_version):
             restore_env(context.env, backup)
             return False
 
-def CheckSDL2Image(context):
+def CheckSDL3Image(context):
     backup = backup_env(context.env, ["CPPPATH", "LIBPATH", "LIBS"])
-    context.Message("Checking for SDL2_image library... ")
-    context.env.AppendUnique(LIBS = ["SDL2_image"])
+    context.Message("Checking for SDL3_image library... ")
+    context.env.AppendUnique(LIBS = ["SDL3_image"])
 
-    cpp_file = File("src/conftests/sdl2_image.cpp").rfile().abspath
+    cpp_file = File("src/conftests/sdl3_image.cpp").rfile().abspath
     if not os.path.isfile(cpp_file):
-        cpp_file = "src/conftests/sdl2_image.cpp"
+        cpp_file = "src/conftests/sdl3_image.cpp"
 
     with open(cpp_file, 'r') as file:
         test_program = file.read()
@@ -73,14 +73,14 @@ def CheckSDL2Image(context):
             restore_env(context.env, backup)
             return False
 
-def CheckSDL2Mixer(context):
+def CheckSDL3Mixer(context):
     backup = backup_env(context.env, ["CPPPATH", "LIBPATH", "LIBS"])
-    context.Message("Checking for SDL2_mixer library... ")
-    context.env.AppendUnique(LIBS = ["SDL2_mixer"])
+    context.Message("Checking for SDL3_mixer library... ")
+    context.env.AppendUnique(LIBS = ["SDL3_mixer"])
 
-    cpp_file = File("src/conftests/sdl2_mixer.cpp").rfile().abspath
+    cpp_file = File("src/conftests/sdl3_mixer.cpp").rfile().abspath
     if not os.path.isfile(cpp_file):
-        cpp_file = "src/conftests/sdl2_mixer.cpp"
+        cpp_file = "src/conftests/sdl3_mixer.cpp"
 
     with open(cpp_file, 'r') as file:
         test_program = file.read()
@@ -96,7 +96,7 @@ def CheckSDL2Mixer(context):
 def CheckOgg(context):
     context.env["ENV"]["SDL_AUDIODRIVER"] = "dummy"
 
-    cpp_file = File("src/conftests/sdl2_audio.cpp").rfile().get_contents().decode()
+    cpp_file = File("src/conftests/sdl3_audio.cpp").rfile().get_contents().decode()
 
     # file1 (absolute path) works most places
     # file2 (relative path) is required for msys2 on windows
@@ -125,7 +125,7 @@ def CheckOgg(context):
             return False
 
 def CheckPNG(context):
-    cpp_file = File("src/conftests/sdl2_png.cpp").rfile().get_contents().decode()
+    cpp_file = File("src/conftests/sdl3_png.cpp").rfile().get_contents().decode()
 
     img_file1 = File("data/core/images/scons_conftest_images/end-n.png").rfile().abspath
     img_file2 = "data/core/images/scons_conftest_images/end-n.png"
@@ -150,7 +150,7 @@ def CheckPNG(context):
             return False
 
 def CheckWebP(context):
-    cpp_file = File("src/conftests/sdl2_webp.cpp").rfile().get_contents().decode()
+    cpp_file = File("src/conftests/sdl3_webp.cpp").rfile().get_contents().decode()
 
     img_file1 = File("data/core/images/scons_conftest_images/end-n.webp").rfile().abspath
     img_file2 = "data/core/images/scons_conftest_images/end-n.webp"
@@ -175,7 +175,7 @@ def CheckWebP(context):
             return False
 
 def CheckJPG(context):
-    cpp_file = File("src/conftests/sdl2_jpg.cpp").rfile().get_contents().decode()
+    cpp_file = File("src/conftests/sdl3_jpg.cpp").rfile().get_contents().decode()
 
     img_file1 = File("data/core/images/scons_conftest_images/end-n.jpg").rfile().abspath
     img_file2 = "data/core/images/scons_conftest_images/end-n.jpg"
@@ -199,9 +199,9 @@ def CheckJPG(context):
             context.Result("no")
             return False
 
-config_checks = { 'CheckSDL2Image' : CheckSDL2Image,
-                  'CheckSDL2Mixer' : CheckSDL2Mixer,
-                  'CheckSDL2': CheckSDL2,
+config_checks = { 'CheckSDL3Image' : CheckSDL3Image,
+                  'CheckSDL3Mixer' : CheckSDL3Mixer,
+                  'CheckSDL3': CheckSDL3,
                   'CheckOgg' : CheckOgg,
                   'CheckPNG' : CheckPNG,
                   'CheckJPG' : CheckJPG,

scons/sdl.py

@@ -98,7 +98,6 @@ editor/toolkit/brush.cpp
 editor/toolkit/editor_toolkit.cpp
 fake_unit_manager.cpp
 fake_unit_ptr.cpp
-filesystem_sdl.cpp
 floating_textbox.cpp
 formula/callable_objects.cpp
 formula/debugger.cpp