[Scummvm-git-logs] scummvm master -> a7e24443a79feddb1d0de33a7dc9be86acac0df2

[sev-]

This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
5c2a6c17f2 CONFIGURE: Define USE_SDL2 in the preprocessor when found
17b7aa2108 BASE: Show SDL1.2/SDL2 in the About dialog
a7e24443a7 SDL: Rely on USE_SDL2 for the setjmp/longjmp MSVC workaround


Commit: 5c2a6c17f28cf395f68a55ae9f8fd7889fd5526f
    https://github.com/scummvm/scummvm/commit/5c2a6c17f28cf395f68a55ae9f8fd7889fd5526f
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2023-03-09T01:30:34+01:00

Commit Message:
CONFIGURE: Define USE_SDL2 in the preprocessor when found

Changed paths:
    configure
    devtools/create_project/create_project.cpp


diff --git a/configure b/configure
index 1b0c8b99679..4ce806a58b8 100755
--- a/configure
+++ b/configure
@@ -4129,6 +4129,7 @@ if test "$_sdl" = yes ; then
 	append_var LIBS "$SDL_LIBS"
 	case $_sdlversion in
 		2.*.*)
+			append_var DEFINES "-DUSE_SDL2"
 			add_line_to_config_mk "USE_SDL2 = 1"
 			_sdlMajorVersionNumber=2
 			;;
diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp
index 3f0df8acd2d..0d79728750f 100644
--- a/devtools/create_project/create_project.cpp
+++ b/devtools/create_project/create_project.cpp
@@ -431,9 +431,6 @@ int main(int argc, char *argv[]) {
 		cout << "\nBuilding against SDL 1.2\n\n";
 	} else {
 		cout << "\nBuilding against SDL 2.0\n\n";
-		// TODO: This also defines USE_SDL2 in the preprocessor, we don't do
-		// this in our configure/make based build system. Adapt create_project
-		// to replicate this behavior.
 		setup.defines.push_back("USE_SDL2");
 	}
 


Commit: 17b7aa2108544d899096f682a079204380611a05
    https://github.com/scummvm/scummvm/commit/17b7aa2108544d899096f682a079204380611a05
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2023-03-09T01:30:34+01:00

Commit Message:
BASE: Show SDL1.2/SDL2 in the About dialog

Changed paths:
    base/version.cpp


diff --git a/base/version.cpp b/base/version.cpp
index 970bc95a15d..64350e8a8f7 100644
--- a/base/version.cpp
+++ b/base/version.cpp
@@ -208,6 +208,13 @@ const char gScummVMFeatures[] = ""
 #ifdef USE_LIBCURL
 	"libcurl "
 #endif
+#ifdef SDL_BACKEND
+#ifdef USE_SDL2
+	"SDL2 "
+#else
+	"SDL1.2 "
+#endif
+#endif
 #ifdef USE_SDL_NET
 	"SDL_net "
 #endif


Commit: a7e24443a79feddb1d0de33a7dc9be86acac0df2
    https://github.com/scummvm/scummvm/commit/a7e24443a79feddb1d0de33a7dc9be86acac0df2
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2023-03-09T01:30:34+01:00

Commit Message:
SDL: Rely on USE_SDL2 for the setjmp/longjmp MSVC workaround

SDL_VERSION_ATLEAST can't be used at this point, but USE_SDL2 is now
available through the preprocessor.

Changed paths:
    backends/platform/sdl/sdl-sys.h


diff --git a/backends/platform/sdl/sdl-sys.h b/backends/platform/sdl/sdl-sys.h
index 59761b9c678..87bd6cabfab 100644
--- a/backends/platform/sdl/sdl-sys.h
+++ b/backends/platform/sdl/sdl-sys.h
@@ -173,9 +173,8 @@
 // In SDL 2.0, intrin.h is now included in SDL_cpuinfo.h, which includes
 // setjmp.h. SDL_cpuinfo.h is included from SDL.h and SDL_syswm.h.
 // Thus, we remove the exceptions for setjmp and longjmp before these two
-// includes. Unfortunately, we can't use SDL_VERSION_ATLEAST here, as SDL.h
-// hasn't been included yet at this point.
-#if !defined(FORBIDDEN_SYMBOL_ALLOW_ALL) && defined(_MSC_VER)
+// includes.
+#if !defined(FORBIDDEN_SYMBOL_ALLOW_ALL) && defined(_MSC_VER) && defined(USE_SDL2)
 // We unset any fake definitions of setjmp/longjmp here
 
 #ifndef FORBIDDEN_SYMBOL_EXCEPTION_setjmp