commit 0a8961b61a0abcd44395efb423484b18a8e7ad69 parent d3f10b96512210ac8854f4355a11e9104a546644 Author: Olav Sørensen <olav.sorensen@live.no> Date: Tue, 11 Oct 2022 14:50:16 +0200 Update SDL to v2.24.1 Diffstat:
16 files changed, 34 insertions(+), 29 deletions(-)
diff --git a/release/macos/ft2-clone-macos.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_atomic.h b/release/macos/ft2-clone-macos.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_atomic.h @@ -240,7 +240,7 @@ typedef void (*SDL_KernelMemoryBarrierFunc)(); /* "REP NOP" is PAUSE, coded for tools that don't know it by that name. */ #if (defined(__GNUC__) || defined(__clang__)) && (defined(__i386__) || defined(__x86_64__)) #define SDL_CPUPauseInstruction() __asm__ __volatile__("pause\n") /* Some assemblers can't do REP NOP, so go with PAUSE. */ -#elif (defined(__arm__) && __ARM_ARCH__ >= 7) || defined(__aarch64__) +#elif (defined(__arm__) && __ARM_ARCH >= 7) || defined(__aarch64__) #define SDL_CPUPauseInstruction() __asm__ __volatile__("yield" ::: "memory") #elif (defined(__powerpc__) || defined(__powerpc64__)) #define SDL_CPUPauseInstruction() __asm__ __volatile__("or 27,27,27"); 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,2 +1,2 @@ -#define SDL_REVISION "https://github.com/libsdl-org/SDL.git@8c9beb0c873f6ca5efbd88f1ad2648bfc793b2ac" +#define SDL_REVISION "https://github.com/libsdl-org/SDL.git@a1d1946dcba6509f0679f507b57e7b228d32e6f8" #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 24 -#define SDL_PATCHLEVEL 0 +#define SDL_PATCHLEVEL 1 /** * 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/CMake/sdl2-config.cmake b/release/macos/ft2-clone-macos.app/Contents/Frameworks/SDL2.framework/Versions/A/Resources/CMake/sdl2-config.cmake @@ -59,6 +59,11 @@ if(NOT TARGET SDL2::SDL2) INTERFACE_SDL2_SHARED "ON" ) endif() -set(SDL2_SDL2_FOUND) +set(SDL2_SDL2_FOUND TRUE) + +if(NOT TARGET SDL2::SDL2main) + add_library(SDL2::SDL2main INTERFACE IMPORTED) +endif() +set(SDL2_SDL2main_FOUND TRUE) check_required_components(SDL2) 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>21G72</string> + <string>21G83</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.24.0</string> + <string>2.24.1</string> <key>CFBundleSignature</key> <string>SDLX</string> <key>CFBundleSupportedPlatforms</key> @@ -27,11 +27,11 @@ <string>MacOSX</string> </array> <key>CFBundleVersion</key> - <string>2.24.0</string> + <string>2.24.1</string> <key>DTCompiler</key> <string>com.apple.compilers.llvm.clang.1_0</string> <key>DTPlatformBuild</key> - <string>13F100</string> + <string>14A400</string> <key>DTPlatformName</key> <string>macosx</string> <key>DTPlatformVersion</key> @@ -41,9 +41,9 @@ <key>DTSDKName</key> <string>macosx12.3</string> <key>DTXcode</key> - <string>1341</string> + <string>1401</string> <key>DTXcodeBuild</key> - <string>13F100</string> + <string>14A400</string> <key>LSMinimumSystemVersion</key> <string>10.9</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 @@ -10,11 +10,11 @@ </data> <key>Resources/CMake/sdl2-config.cmake</key> <data> - HIVCk4pjc2SA8Q0CeOuI9See/ig= + XSGoflduFZf82qGl/+WskdKOBw0= </data> <key>Resources/Info.plist</key> <data> - cbKsc5qfmkednkZS7bwfnSPYv6E= + G5afrcjIQY7IyFa2ddwCUvyFlPc= </data> <key>Resources/License.txt</key> <data> @@ -26,7 +26,7 @@ </data> <key>Resources/default.metallib</key> <data> - 50m0avYLiIBc6a4gWqXN3tnFlpU= + 4l5HIH0YrJO09WMMo9BAQG+BSjY= </data> </dict> <key>files2</key> @@ -57,11 +57,11 @@ <dict> <key>hash</key> <data> - MtIOolKuZrr/MtJ6Z+xtKqdoxy4= + S7vGRTzBHVXKyXwYhhvUpfME4bs= </data> <key>hash2</key> <data> - mUsfflKl2MaXdbOJS7PEhdEuZLHLYsbJDnSTyB1MVow= + yyqMgvtuNLSklwq2qM62TTuiLks55E6BNKOB08e6EzQ= </data> </dict> <key>Headers/SDL_audio.h</key> @@ -563,11 +563,11 @@ <dict> <key>hash</key> <data> - 64trCQYpUO9fsjyAvv5Nq2/dfe8= + gJvueJVaGjBAoAUZ/ZZDSlXPmzk= </data> <key>hash2</key> <data> - 4/jo/mbVJ1mMXX+pJeEEssA8uR5Q9NPMHHrmO982jmo= + GDPtrgtgxZaH6s2Tg8aNSgKCEYdL5Dyz4FTbKb5GiT0= </data> </dict> <key>Headers/SDL_rwops.h</key> @@ -706,11 +706,11 @@ <dict> <key>hash</key> <data> - EyeV0WK7AxR0Z06kMqeNkDV1k/k= + A9pTspEqTiDa5Jo5uKp0lRdX8jo= </data> <key>hash2</key> <data> - R7JfwFDH+owMGrurdDlPvA/S6LV896v6hB7VzS6dtOI= + maEtnUY+anHONL0tYQVIhjvxe4bQ8GEd8NzqfLyr8NE= </data> </dict> <key>Headers/SDL_video.h</key> @@ -772,22 +772,22 @@ <dict> <key>hash</key> <data> - HIVCk4pjc2SA8Q0CeOuI9See/ig= + XSGoflduFZf82qGl/+WskdKOBw0= </data> <key>hash2</key> <data> - DQWiQSoU3Pk8K0eKagpm71Vyr+2ssJ4/qlUgXfc1Mmo= + oO7paOWdt4AGUK6i7ifbCbWdp4I741YtJf3U2SIi9ro= </data> </dict> <key>Resources/Info.plist</key> <dict> <key>hash</key> <data> - cbKsc5qfmkednkZS7bwfnSPYv6E= + G5afrcjIQY7IyFa2ddwCUvyFlPc= </data> <key>hash2</key> <data> - jc5irzEV/JMBrsSVKo1Y4EpkPvKJb8KqEBgmWS9RBoc= + x80g0iIVcnoeE4ew8iJZBg8GD0oM9s7EhHkplaKUqz8= </data> </dict> <key>Resources/License.txt</key> @@ -816,11 +816,11 @@ <dict> <key>hash</key> <data> - 50m0avYLiIBc6a4gWqXN3tnFlpU= + 4l5HIH0YrJO09WMMo9BAQG+BSjY= </data> <key>hash2</key> <data> - w8jS3DIw3CKDRfJsmiA4MWFVPhdpi2zi+WEO1Zfw8+8= + mG4gq0ZWuiydHgb5Xh0OvlnGHDkCdvaqQKnD5G1m7xc= </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/src/ft2_header.h b/src/ft2_header.h @@ -12,7 +12,7 @@ #endif #include "ft2_replayer.h" -#define PROG_VER_STR "1.59" +#define PROG_VER_STR "1.60" // do NOT change these! It will only mess things up... 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_atomic.h b/vs2019_project/ft2-clone/sdl/include/SDL2/SDL_atomic.h @@ -240,7 +240,7 @@ typedef void (*SDL_KernelMemoryBarrierFunc)(); /* "REP NOP" is PAUSE, coded for tools that don't know it by that name. */ #if (defined(__GNUC__) || defined(__clang__)) && (defined(__i386__) || defined(__x86_64__)) #define SDL_CPUPauseInstruction() __asm__ __volatile__("pause\n") /* Some assemblers can't do REP NOP, so go with PAUSE. */ -#elif (defined(__arm__) && __ARM_ARCH__ >= 7) || defined(__aarch64__) +#elif (defined(__arm__) && __ARM_ARCH >= 7) || defined(__aarch64__) #define SDL_CPUPauseInstruction() __asm__ __volatile__("yield" ::: "memory") #elif (defined(__powerpc__) || defined(__powerpc64__)) #define SDL_CPUPauseInstruction() __asm__ __volatile__("or 27,27,27"); 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,2 +1,2 @@ -#define SDL_REVISION "https://github.com/libsdl-org/SDL.git@8c9beb0c873f6ca5efbd88f1ad2648bfc793b2ac" +#define SDL_REVISION "https://github.com/libsdl-org/SDL.git@a1d1946dcba6509f0679f507b57e7b228d32e6f8" #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 24 -#define SDL_PATCHLEVEL 0 +#define SDL_PATCHLEVEL 1 /** * 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.