commit c2bf3e2d622a9bf9586cd98422a884877e933bc1 parent 3709d13d6db23ae2670745e06ed543c12d08724d Author: Olav Sørensen <olav.sorensen@live.no> Date: Tue, 9 Apr 2024 12:34:27 +0200 Windows/macOS: Update SDL to v2.30.2 Diffstat:
14 files changed, 32 insertions(+), 28 deletions(-)
diff --git a/release/macos/ft2-clone-macos.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_platform.h b/release/macos/ft2-clone-macos.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_platform.h @@ -199,8 +199,10 @@ #undef __GDK__ #define __GDK__ 1 #endif -#if defined(__PSP__) +#if defined(__PSP__) || defined(__psp__) +#ifdef __PSP__ #undef __PSP__ +#endif #define __PSP__ 1 #endif #if defined(PS2) diff --git a/release/macos/ft2-clone-macos.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_revision.h b/release/macos/ft2-clone-macos.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_revision.h @@ -1,7 +1,7 @@ /* Generated by updaterev.sh, do not edit */ #ifdef SDL_VENDOR_INFO -#define SDL_REVISION "SDL-release-2.30.1-0-g5adbf3765 (" SDL_VENDOR_INFO ")" +#define SDL_REVISION "SDL-release-2.30.2-0-gf461d91cd (" SDL_VENDOR_INFO ")" #else -#define SDL_REVISION "SDL-release-2.30.1-0-g5adbf3765" +#define SDL_REVISION "SDL-release-2.30.2-0-gf461d91cd" #endif #define SDL_REVISION_NUMBER 0 diff --git a/release/macos/ft2-clone-macos.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_version.h b/release/macos/ft2-clone-macos.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_version.h @@ -59,7 +59,7 @@ typedef struct SDL_version */ #define SDL_MAJOR_VERSION 2 #define SDL_MINOR_VERSION 30 -#define SDL_PATCHLEVEL 1 +#define SDL_PATCHLEVEL 2 /** * Macro to determine SDL version program was compiled against. diff --git a/release/macos/ft2-clone-macos.app/Contents/Frameworks/SDL2.framework/Versions/A/Resources/Info.plist b/release/macos/ft2-clone-macos.app/Contents/Frameworks/SDL2.framework/Versions/A/Resources/Info.plist @@ -3,7 +3,7 @@ <plist version="1.0"> <dict> <key>BuildMachineOSBuild</key> - <string>23D60</string> + <string>23E224</string> <key>CFBundleDevelopmentRegion</key> <string>English</string> <key>CFBundleExecutable</key> @@ -19,7 +19,7 @@ <key>CFBundlePackageType</key> <string>FMWK</string> <key>CFBundleShortVersionString</key> - <string>2.30.1</string> + <string>2.30.2</string> <key>CFBundleSignature</key> <string>SDLX</string> <key>CFBundleSupportedPlatforms</key> @@ -27,7 +27,7 @@ <string>MacOSX</string> </array> <key>CFBundleVersion</key> - <string>2.30.1</string> + <string>2.30.2</string> <key>DTCompiler</key> <string>com.apple.compilers.llvm.clang.1_0</string> <key>DTPlatformBuild</key> @@ -35,15 +35,15 @@ <key>DTPlatformName</key> <string>macosx</string> <key>DTPlatformVersion</key> - <string>14.2</string> + <string>14.4</string> <key>DTSDKBuild</key> - <string>23C53</string> + <string>23E208</string> <key>DTSDKName</key> - <string>macosx14.2</string> + <string>macosx14.4</string> <key>DTXcode</key> - <string>1520</string> + <string>1530</string> <key>DTXcodeBuild</key> - <string>15C500b</string> + <string>15E204a</string> <key>LSMinimumSystemVersion</key> <string>10.11</string> </dict> diff --git a/release/macos/ft2-clone-macos.app/Contents/Frameworks/SDL2.framework/Versions/A/Resources/default.metallib b/release/macos/ft2-clone-macos.app/Contents/Frameworks/SDL2.framework/Versions/A/Resources/default.metallib Binary files differ. diff --git a/release/macos/ft2-clone-macos.app/Contents/Frameworks/SDL2.framework/Versions/A/SDL2 b/release/macos/ft2-clone-macos.app/Contents/Frameworks/SDL2.framework/Versions/A/SDL2 Binary files differ. diff --git a/release/macos/ft2-clone-macos.app/Contents/Frameworks/SDL2.framework/Versions/A/_CodeSignature/CodeResources b/release/macos/ft2-clone-macos.app/Contents/Frameworks/SDL2.framework/Versions/A/_CodeSignature/CodeResources @@ -14,7 +14,7 @@ </data> <key>Resources/Info.plist</key> <data> - ZHmmRK90boQu0lf8kuoupR5C534= + xxjLXf8umGDvorJwQToOZvJb+LI= </data> <key>Resources/License.txt</key> <data> @@ -26,7 +26,7 @@ </data> <key>Resources/default.metallib</key> <data> - QwX80pzFcZED9JtaD8IhQ/uayn0= + YrRnNqKCIDuni+6CKxtbY1kbYlw= </data> </dict> <key>files2</key> @@ -508,11 +508,11 @@ <dict> <key>hash</key> <data> - wJW6P5cSLWw7CLKwCduRMFILJMs= + NywZ7lb1AObplGXdgvKYUQnFr3E= </data> <key>hash2</key> <data> - rfvhg9xhDPbHHDguY5qvRo/mzZyCbJMSA9625XkbQy0= + /XPmip0lyp07Lnry52Ki2A7dornwXXFxn1W94/cdCO0= </data> </dict> <key>Headers/SDL_power.h</key> @@ -563,11 +563,11 @@ <dict> <key>hash</key> <data> - BP7HEBYnBwbk8tHzZPgc3YbrqxQ= + QR/EqmyEkjhJXrWe2LStfwBGG/4= </data> <key>hash2</key> <data> - OaVGrGQNu1FqBbGBlpCqSy2PHisu9o9LzvAg42f1/JI= + uR4gNQwz5IYMMHZflMaZxOTwGwrYDLcyYQlbbPMpm3w= </data> </dict> <key>Headers/SDL_rwops.h</key> @@ -706,11 +706,11 @@ <dict> <key>hash</key> <data> - OGZ8BfEEkHiQnTtIvNq9aYEj7FY= + WO6pCYeF3qTP69F4sWD442sgezQ= </data> <key>hash2</key> <data> - juogOjtV5ZeXFCoHo69XFA1QWPNDN4r0MdblxepalE8= + pXT1eYRliBTvr45AyMoEr960xzfZ19y99t80KzPQv3U= </data> </dict> <key>Headers/SDL_video.h</key> @@ -783,11 +783,11 @@ <dict> <key>hash</key> <data> - ZHmmRK90boQu0lf8kuoupR5C534= + xxjLXf8umGDvorJwQToOZvJb+LI= </data> <key>hash2</key> <data> - B6t0lho1afDvcrYh3u2JI7SM9qV8RRd+48xEAIyinO8= + Ikl+0G36oc/K1BK2OQNF3aybj3O5vaHu74adDuyR5P8= </data> </dict> <key>Resources/License.txt</key> @@ -816,11 +816,11 @@ <dict> <key>hash</key> <data> - QwX80pzFcZED9JtaD8IhQ/uayn0= + YrRnNqKCIDuni+6CKxtbY1kbYlw= </data> <key>hash2</key> <data> - 81kjRE2J1UCGqrIQCmKYXixkYjbOC68/+l4AoNBo6C8= + goC4ji0E3XChWw9+V/QA4PFdbLXiQkmV6QWCcaD6Wzo= </data> </dict> </dict> diff --git a/release/win32/SDL2.dll b/release/win32/SDL2.dll Binary files differ. diff --git a/release/win64/SDL2.dll b/release/win64/SDL2.dll Binary files differ. diff --git a/vs2019_project/ft2-clone/SDL2.dll b/vs2019_project/ft2-clone/SDL2.dll Binary files differ. diff --git a/vs2019_project/ft2-clone/sdl/include/SDL2/SDL_platform.h b/vs2019_project/ft2-clone/sdl/include/SDL2/SDL_platform.h @@ -199,8 +199,10 @@ #undef __GDK__ #define __GDK__ 1 #endif -#if defined(__PSP__) +#if defined(__PSP__) || defined(__psp__) +#ifdef __PSP__ #undef __PSP__ +#endif #define __PSP__ 1 #endif #if defined(PS2) diff --git a/vs2019_project/ft2-clone/sdl/include/SDL2/SDL_revision.h b/vs2019_project/ft2-clone/sdl/include/SDL2/SDL_revision.h @@ -1,7 +1,7 @@ /* Generated by updaterev.sh, do not edit */ #ifdef SDL_VENDOR_INFO -#define SDL_REVISION "SDL-release-2.30.1-0-g5adbf3765 (" SDL_VENDOR_INFO ")" +#define SDL_REVISION "SDL-release-2.30.2-0-gf461d91cd (" SDL_VENDOR_INFO ")" #else -#define SDL_REVISION "SDL-release-2.30.1-0-g5adbf3765" +#define SDL_REVISION "SDL-release-2.30.2-0-gf461d91cd" #endif #define SDL_REVISION_NUMBER 0 diff --git a/vs2019_project/ft2-clone/sdl/include/SDL2/SDL_version.h b/vs2019_project/ft2-clone/sdl/include/SDL2/SDL_version.h @@ -59,7 +59,7 @@ typedef struct SDL_version */ #define SDL_MAJOR_VERSION 2 #define SDL_MINOR_VERSION 30 -#define SDL_PATCHLEVEL 1 +#define SDL_PATCHLEVEL 2 /** * Macro to determine SDL version program was compiled against. diff --git a/vs2019_project/x64/Debug/SDL2.dll b/vs2019_project/x64/Debug/SDL2.dll Binary files differ.