commit 64f8e050f5de8d58e797ebcdfba17a4ad3afb022 parent 5137f5d5af98159def020f575fe094585fc1f549 Author: Olav Sørensen <olav.sorensen@live.no> Date: Tue, 10 Dec 2024 21:57:17 +0100 Windows/macOS: Updated SDL to v2.30.10 Diffstat:
21 files changed, 22 insertions(+), 18 deletions(-)
diff --git a/release/macos/ft2-clone-macos.app/Contents/Frameworks/SDL2.framework/Headers b/release/macos/ft2-clone-macos.app/Contents/Frameworks/SDL2.framework/Headers Binary files differ. diff --git a/release/macos/ft2-clone-macos.app/Contents/Frameworks/SDL2.framework/Resources b/release/macos/ft2-clone-macos.app/Contents/Frameworks/SDL2.framework/Resources Binary files differ. diff --git a/release/macos/ft2-clone-macos.app/Contents/Frameworks/SDL2.framework/SDL2 b/release/macos/ft2-clone-macos.app/Contents/Frameworks/SDL2.framework/SDL2 Binary files differ. diff --git a/release/macos/ft2-clone-macos.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_cpuinfo.h b/release/macos/ft2-clone-macos.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_cpuinfo.h @@ -53,9 +53,11 @@ _m_prefetch(void *__P) #ifndef __MMX__ #define __MMX__ #endif +/* #ifndef __3dNOW__ #define __3dNOW__ #endif +*/ #endif #ifndef __SSE__ #define __SSE__ diff --git a/release/macos/ft2-clone-macos.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_stdinc.h b/release/macos/ft2-clone-macos.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_stdinc.h @@ -255,8 +255,8 @@ typedef uint64_t Uint64; #ifndef SDL_PRIs64 #if defined(__WIN32__) || defined(__GDK__) #define SDL_PRIs64 "I64d" -#elif defined(PRIs64) -#define SDL_PRIs64 PRIs64 +#elif defined(PRId64) +#define SDL_PRIs64 PRId64 #elif defined(__LP64__) && !defined(__APPLE__) && !defined(__EMSCRIPTEN__) #define SDL_PRIs64 "ld" #else 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 9 +#define SDL_PATCHLEVEL 10 /** * 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>23H124</string> + <string>23H222</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.9</string> + <string>2.30.10</string> <key>CFBundleSignature</key> <string>SDLX</string> <key>CFBundleSupportedPlatforms</key> @@ -27,7 +27,7 @@ <string>MacOSX</string> </array> <key>CFBundleVersion</key> - <string>2.30.9</string> + <string>2.30.10</string> <key>DTCompiler</key> <string>com.apple.compilers.llvm.clang.1_0</string> <key>DTPlatformBuild</key> 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> - 6ZYOMHaOYK0y//pgRxbrRTmghgM= + psBFNKMxE1lQbuBYANGXFzReZ9g= </data> <key>Resources/License.txt</key> <data> @@ -145,11 +145,11 @@ <dict> <key>hash</key> <data> - mdEBzZyevtfCXZXXEJ8sEfUNr4U= + RzJruo8ktMeBPUMnBCmlnP88g10= </data> <key>hash2</key> <data> - V8DTu2oLBQZVxwExFsdWY3S7eIvxwh2Kc/C9TgUHS/g= + SHQnpBJWO9cChWzih9hY5Kcg46q2pfBqbxrhQ8L/IsI= </data> </dict> <key>Headers/SDL_endian.h</key> @@ -618,11 +618,11 @@ <dict> <key>hash</key> <data> - c3m7eehD1NIIXfsZ4lm6lgZO/AM= + DdRe/lNH6geRuVqhs5huipbzLj8= </data> <key>hash2</key> <data> - elTc5qJYwUBuKwCpNzRR+2giYouwx+mKzw1+qVrO+68= + mMaKFT0Acqvtg4K6gEpb8NUklIR8L00B8JxlSl/z8Oc= </data> </dict> <key>Headers/SDL_surface.h</key> @@ -706,11 +706,11 @@ <dict> <key>hash</key> <data> - ttcgxHkFC9JNkusMwO1ZwMHT0J4= + V1WhIT6vXhEOcfu+cDo+LwvkvRE= </data> <key>hash2</key> <data> - OL6CnEC1BJE1NNZ/rzV9irlTFLO23OulTCH67f1odps= + TaCZnrgTfgRARYIobSD3i3KArXOQUxuYjG/sFBoYo0k= </data> </dict> <key>Headers/SDL_video.h</key> @@ -783,11 +783,11 @@ <dict> <key>hash</key> <data> - 6ZYOMHaOYK0y//pgRxbrRTmghgM= + psBFNKMxE1lQbuBYANGXFzReZ9g= </data> <key>hash2</key> <data> - TdNrc/OZRL1tzIoTtvRoDcp2GfIbLSIjL9mu5CfONUE= + 4xu3tgP1KITWbi4Aj0nk5zBH4+4IL2X4goDmHNl+IGA= </data> </dict> <key>Resources/License.txt</key> diff --git a/release/macos/ft2-clone-macos.app/Contents/Frameworks/SDL2.framework/Versions/Current b/release/macos/ft2-clone-macos.app/Contents/Frameworks/SDL2.framework/Versions/Current Binary files differ. 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_cpuinfo.h b/vs2019_project/ft2-clone/sdl/include/SDL2/SDL_cpuinfo.h @@ -53,9 +53,11 @@ _m_prefetch(void *__P) #ifndef __MMX__ #define __MMX__ #endif +/* #ifndef __3dNOW__ #define __3dNOW__ #endif +*/ #endif #ifndef __SSE__ #define __SSE__ diff --git a/vs2019_project/ft2-clone/sdl/include/SDL2/SDL_stdinc.h b/vs2019_project/ft2-clone/sdl/include/SDL2/SDL_stdinc.h @@ -255,8 +255,8 @@ typedef uint64_t Uint64; #ifndef SDL_PRIs64 #if defined(__WIN32__) || defined(__GDK__) #define SDL_PRIs64 "I64d" -#elif defined(PRIs64) -#define SDL_PRIs64 PRIs64 +#elif defined(PRId64) +#define SDL_PRIs64 PRId64 #elif defined(__LP64__) && !defined(__APPLE__) && !defined(__EMSCRIPTEN__) #define SDL_PRIs64 "ld" #else 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 9 +#define SDL_PATCHLEVEL 10 /** * Macro to determine SDL version program was compiled against. diff --git a/vs2019_project/ft2-clone/sdl/lib/SDL2.lib b/vs2019_project/ft2-clone/sdl/lib/SDL2.lib Binary files differ. diff --git a/vs2019_project/ft2-clone/sdl/lib/SDL2main.lib b/vs2019_project/ft2-clone/sdl/lib/SDL2main.lib Binary files differ. diff --git a/vs2019_project/ft2-clone/sdl/lib64/SDL2.lib b/vs2019_project/ft2-clone/sdl/lib64/SDL2.lib Binary files differ. diff --git a/vs2019_project/ft2-clone/sdl/lib64/SDL2main.lib b/vs2019_project/ft2-clone/sdl/lib64/SDL2main.lib Binary files differ. diff --git a/vs2019_project/x64/Debug/SDL2.dll b/vs2019_project/x64/Debug/SDL2.dll Binary files differ.