update SDL2 version for macos

Add gamecontrollerdb.txt from mdqinc/SDL_GameControllerDB@25eb9ea8e546f.
Also the SDL2 Controller API needs to be initialised along with the
Video API for detection on macOS to work (ref libsdl-org/SDL#12886).

Author: jonof

kenbuild/rsrc/gamecontrollerdb.txt

@@ -242,7 +242,7 @@ int main(int argc, char *argv[])
 	buildkeytranslationtable();
 
 	// SDL must be initialised before GTK or else crashing will ensue.
-	if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER)) {
+	if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER | SDL_INIT_GAMECONTROLLER)) {
 		buildprintf("Early initialisation of SDL failed! (%s)\n", SDL_GetError());
 		return 1;
 	}
@@ -400,7 +400,7 @@ int initinput(void)
 		strncpy(keynames[ keytranslation[i].normal ], SDL_GetScancodeName(i), sizeof(keynames[i])-1);
 	}
 
-	if (!SDL_InitSubSystem(SDL_INIT_GAMECONTROLLER)) {
+	if (SDL_WasInit(SDL_INIT_GAMECONTROLLER)) {
 		int flen, fh;
 		char *dbuf = NULL;
 		SDL_RWops *rwops = NULL;

src/sdlayer2.c

@@ -879,7 +879,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if [ -d $PROJECT_DIR/frameworks/SDL2.framework ]; then\n    echo \"SDL2.framework exists; skipping\"\n    exit\nfi\n\nsdlver=2.30.0\n\nset -xe\ncd $PROJECT_TEMP_DIR\nmkdir -p $PROJECT_TEMP_DIR/sdl2 $PROJECT_DIR/frameworks\ncurl -sfSOL https://github.com/libsdl-org/SDL/releases/download/release-$sdlver/SDL2-$sdlver.dmg\nhdiutil attach SDL2-$sdlver.dmg -mountpoint $PROJECT_TEMP_DIR/sdl2\ncp -R $PROJECT_TEMP_DIR/sdl2/SDL2.framework $PROJECT_DIR/frameworks/\nhdiutil eject $PROJECT_TEMP_DIR/sdl2\n";
+			shellScript = "sdlver=2.32.10\n\nif [ -d $PROJECT_DIR/frameworks/SDL2.framework ]; then\n    fwkver=$(plutil -extract CFBundleVersion raw $PROJECT_DIR/frameworks/SDL2.framework/Resources/Info.plist)\n    vercheck=$(perl -mversion=0.77 -e 'print version->parse(\"'$fwkver'\") <=> version->parse(\"'$sdlver'\")')\n    if [ $vercheck -lt 0 ]; then\n        echo \"SDL2.framework version $fwkver exists, which is older than desired $sdlver; updating\"\n        rm -rf $PROJECT_DIR/frameworks/SDL2.framework\n    else\n        echo \"SDL2.framework version $sdlver exists; skipping\"\n        exit\n    fi\nfi\n\nset -xe\ncd $PROJECT_TEMP_DIR\nmkdir -p $PROJECT_TEMP_DIR/sdl2 $PROJECT_DIR/frameworks\ncurl -sfSOL https://github.com/libsdl-org/SDL/releases/download/release-$sdlver/SDL2-$sdlver.dmg\nhdiutil attach SDL2-$sdlver.dmg -mountpoint $PROJECT_TEMP_DIR/sdl2\ncp -R $PROJECT_TEMP_DIR/sdl2/SDL2.framework $PROJECT_DIR/frameworks/\nhdiutil eject $PROJECT_TEMP_DIR/sdl2\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */

xcode/engine.xcodeproj/project.pbxproj

@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		AB0427BD2E7669CA00E2A322 /* gamecontrollerdb.txt in Resources */ = {isa = PBXBuildFile; fileRef = AB0427BC2E7669CA00E2A322 /* gamecontrollerdb.txt */; };
 		AB053FAF0A33136D00FA2918 /* startwin.game.nib in Resources */ = {isa = PBXBuildFile; fileRef = AB053FAE0A33136D00FA2918 /* startwin.game.nib */; };
 		AB3930032B942820002B0F5D /* klist in Copy additional editor tools */ = {isa = PBXBuildFile; fileRef = AB3930022B942814002B0F5D /* klist */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
 		AB3DEDA21BD23DAB0009D070 /* Game Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = AB3DEDA11BD23DAB0009D070 /* Game Images.xcassets */; };
@@ -239,6 +240,7 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		AB0427BC2E7669CA00E2A322 /* gamecontrollerdb.txt */ = {isa = PBXFileReference; lastKnownFileType = text; name = gamecontrollerdb.txt; path = ../kenbuild/rsrc/gamecontrollerdb.txt; sourceTree = "<group>"; };
 		AB053FAE0A33136D00FA2918 /* startwin.game.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; path = startwin.game.nib; sourceTree = SOURCE_ROOT; };
 		AB3DEDA11BD23DAB0009D070 /* Game Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Game Images.xcassets"; sourceTree = "<group>"; };
 		AB3DEDA31BD23EE70009D070 /* Editor Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Editor Images.xcassets"; sourceTree = "<group>"; };
@@ -350,6 +352,7 @@
 		AB7360200A29AA88003261DC /* Game */ = {
 			isa = PBXGroup;
 			children = (
+				AB0427BC2E7669CA00E2A322 /* gamecontrollerdb.txt */,
 				AB3DEDA11BD23DAB0009D070 /* Game Images.xcassets */,
 				ABA9E3320FEF9E470024231F /* game.c */,
 				ABA9E3330FEF9E470024231F /* game.h */,
@@ -557,6 +560,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				AB0427BD2E7669CA00E2A322 /* gamecontrollerdb.txt in Resources */,
 				AB3DEDA21BD23DAB0009D070 /* Game Images.xcassets in Resources */,
 				AB053FAF0A33136D00FA2918 /* startwin.game.nib in Resources */,
 			);