[Scummvm-git-logs] scummvm branch-2-6 -> dee595561d4c2700a90cd1f3658c38ed4dca85b5

[sev-]

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

Summary:
dee595561d CONFIGURE: Fix compilation with SDL 2.23.0 or later


Commit: dee595561d4c2700a90cd1f3658c38ed4dca85b5
    https://github.com/scummvm/scummvm/commit/dee595561d4c2700a90cd1f3658c38ed4dca85b5
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2022-07-02T22:50:19+02:00

Commit Message:
CONFIGURE: Fix compilation with SDL 2.23.0 or later

Changed paths:
    configure


diff --git a/configure b/configure
index ee1c5c2088c..cfdefcb052d 100755
--- a/configure
+++ b/configure
@@ -3852,13 +3852,17 @@ if test "$_sdl" = yes ; then
 	append_var INCLUDES "$SDL_CFLAGS"
 	append_var LIBS "$SDL_LIBS"
 	case $_sdlversion in
-		2.0.*)
+		2.*.*)
 			add_line_to_config_mk "USE_SDL2 = 1"
 			_sdlMajorVersionNumber=2
 			;;
-		*)
+		1.2.*)
 			_sdlMajorVersionNumber=1
 			;;
+		*)
+			echo "support for SDL $_sdlversion not implemented yet"
+			exit 1
+			;;
 	esac
 fi
 
@@ -5427,7 +5431,7 @@ if test "$_opengl_mode" != none ; then
 					_opengl_mode=gl
 					;;
 
-				2.0.*)
+				*)
 					# SDL2 supports both OpenGL + OpenGL ES contexts.
 					# However, macOS only allows OpenGL context creation at
 					# this time, thus we limit us to OpenGL on that platform.
@@ -5554,12 +5558,6 @@ fi
 
 _opengl=yes
 case $_opengl_mode in
-	auto)
-		# This case should never occur but better safe than sorry.
-		echo "no"
-		_opengl=no
-		;;
-
 	none)
 		echo "no"
 		_opengl=no