ref: 6fd171e9823aa8e8349fa3d4bd725846b298235e
parent: 44fee2ee791e694ad985b671045ce0db4a79a0da
author: Olav Sørensen <olav.sorensen@live.no>
date: Wed May 21 09:51:07 EDT 2025
Windows/macOS: Updated SDL to v2.32.6
--- 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
@@ -115,7 +115,8 @@
#include <lasxintrin.h>
#define __LASX__
#endif
-#if defined(HAVE_IMMINTRIN_H) && !defined(SDL_DISABLE_IMMINTRIN_H)
+#if defined(HAVE_IMMINTRIN_H) && !defined(SDL_DISABLE_IMMINTRIN_H) && \
+ (defined(__x86_64__) || defined(_M_X64) || defined(__i386__) || defined(_M_IX86))
#include <immintrin.h>
#else
#if defined(__MMX__) && !defined(SDL_DISABLE_MMINTRIN_H)
--- a/release/macos/ft2-clone-macos.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_render.h
+++ b/release/macos/ft2-clone-macos.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_render.h
@@ -244,7 +244,7 @@
* \since This function is available since SDL 2.0.0.
*
* \sa SDL_CreateRenderer
- * \sa SDL_CreateWindowRenderer
+ * \sa SDL_CreateWindowAndRenderer
* \sa SDL_DestroyRenderer
*/
extern DECLSPEC SDL_Renderer * SDLCALL SDL_CreateSoftwareRenderer(SDL_Surface * surface);
@@ -787,7 +787,7 @@
* Get the current render target.
*
* The default render target is the window for which the renderer was created,
- * and is reported a NULL here.
+ * and is reported as NULL here.
*
* \param renderer the rendering context.
* \returns the current render target or NULL for the default render target.
--- a/release/macos/ft2-clone-macos.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_surface.h
+++ b/release/macos/ft2-clone-macos.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_surface.h
@@ -808,8 +808,8 @@
*
* This assumes that the source and destination rectangles are the same size.
* If either `srcrect` or `dstrect` are NULL, the entire surface (`src` or
- * `dst`) is copied. The final blit rectangles are saved in `srcrect` and
- * `dstrect` after all clipping is performed.
+ * `dst`) is copied. The final blit rectangle is saved in `dstrect` after
+ * all clipping is performed.
*
* The blit function should not be called on a locked surface.
*
--- 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
@@ -58,7 +58,7 @@
*/
#define SDL_MAJOR_VERSION 2
#define SDL_MINOR_VERSION 32
-#define SDL_PATCHLEVEL 2
+#define SDL_PATCHLEVEL 6
/**
* Macro to determine SDL version program was compiled against.
--- 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>23H311</string>
+ <string>23H527</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.32.2</string>
+ <string>2.32.6</string>
<key>CFBundleSignature</key>
<string>SDLX</string>
<key>CFBundleSupportedPlatforms</key>
@@ -27,7 +27,7 @@
<string>MacOSX</string>
</array>
<key>CFBundleVersion</key>
- <string>2.32.2</string>
+ <string>2.32.6</string>
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
binary files 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 differ
--- 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>
- Dy9w1XfagXeZ0e81ZSWsFJg+azY=
+ Zda7B5zOlgXIAj0SZw10DI8J4zY=
</data>
<key>Resources/License.txt</key>
<data>
@@ -145,11 +145,11 @@
<dict>
<key>hash</key>
<data>
- C0H58cl/xghA4cpTvltFa5zADSc=
+ CeTntJ1/RigZITBOca8u0bHomBU=
</data>
<key>hash2</key>
<data>
- JpncPWHkqqQ39WvjWBFvdMLGOAhlGvwtEdtEflUSwwQ=
+ cf1WEDXGbROkg2mF2Ud2LBT6uDs538geSmtZNk/UbFM=
</data>
</dict>
<key>Headers/SDL_endian.h</key>
@@ -552,11 +552,11 @@
<dict>
<key>hash</key>
<data>
- ixhZ1LVMllogghoxkbkrnjkmfm0=
+ O06ha5CcqgUpx/DNe21x0YQxIkM=
</data>
<key>hash2</key>
<data>
- YKCPJJ9GkJ8hiZ95O876mXtZ5SvBv5ViiUsgYkuykPs=
+ lhJ8iMN5E5pflshoCY39V3/f9CI7ix5+NrtiMwoOUGc=
</data>
</dict>
<key>Headers/SDL_revision.h</key>
@@ -629,11 +629,11 @@
<dict>
<key>hash</key>
<data>
- 4Ep9Q21aB+MvJ4ohfIaIobCiERU=
+ tAHaYERzc7BuDPbTMZ9V0iiH9ZU=
</data>
<key>hash2</key>
<data>
- HBm9M4a5z2TAO7jYrEREEBPmFIZ10He+SyiAhJ90C6M=
+ 9PEjHfv4FZvsaPshfa6RkEur0QmJ1J96vlutaGTdeSA=
</data>
</dict>
<key>Headers/SDL_system.h</key>
@@ -706,11 +706,11 @@
<dict>
<key>hash</key>
<data>
- 0p5YxpDU0ZKVW3O7oaiUEbQvQgM=
+ gPL2qjhQt9pswRR/UrpHYP61KNo=
</data>
<key>hash2</key>
<data>
- EtiQXi0LseubTFgUWQb2VmPg9hMBLtbyUYL/q744sqo=
+ 5wMLgwuCEV//z0Hwsvs0UIsP9NcnMIH4jtOo6pMgtLE=
</data>
</dict>
<key>Headers/SDL_video.h</key>
@@ -783,11 +783,11 @@
<dict>
<key>hash</key>
<data>
- Dy9w1XfagXeZ0e81ZSWsFJg+azY=
+ Zda7B5zOlgXIAj0SZw10DI8J4zY=
</data>
<key>hash2</key>
<data>
- BAddkaN2r4dEHPxmdAwZ33wKCEuHqn1y3xUe9sQ/wtY=
+ tmWhV3TAUQkq3CfjDOIa/2S0mjQq6mtKeD/TSdsmAwo=
</data>
</dict>
<key>Resources/License.txt</key>
binary files a/release/win32/SDL2.dll b/release/win32/SDL2.dll differ
binary files a/release/win64/SDL2.dll b/release/win64/SDL2.dll differ
binary files a/vs2019_project/ft2-clone/SDL2.dll b/vs2019_project/ft2-clone/SDL2.dll differ
--- a/vs2019_project/ft2-clone/sdl/include/SDL2/SDL_cpuinfo.h
+++ b/vs2019_project/ft2-clone/sdl/include/SDL2/SDL_cpuinfo.h
@@ -115,7 +115,8 @@
#include <lasxintrin.h>
#define __LASX__
#endif
-#if defined(HAVE_IMMINTRIN_H) && !defined(SDL_DISABLE_IMMINTRIN_H)
+#if defined(HAVE_IMMINTRIN_H) && !defined(SDL_DISABLE_IMMINTRIN_H) && \
+ (defined(__x86_64__) || defined(_M_X64) || defined(__i386__) || defined(_M_IX86))
#include <immintrin.h>
#else
#if defined(__MMX__) && !defined(SDL_DISABLE_MMINTRIN_H)
--- a/vs2019_project/ft2-clone/sdl/include/SDL2/SDL_render.h
+++ b/vs2019_project/ft2-clone/sdl/include/SDL2/SDL_render.h
@@ -244,7 +244,7 @@
* \since This function is available since SDL 2.0.0.
*
* \sa SDL_CreateRenderer
- * \sa SDL_CreateWindowRenderer
+ * \sa SDL_CreateWindowAndRenderer
* \sa SDL_DestroyRenderer
*/
extern DECLSPEC SDL_Renderer * SDLCALL SDL_CreateSoftwareRenderer(SDL_Surface * surface);
@@ -787,7 +787,7 @@
* Get the current render target.
*
* The default render target is the window for which the renderer was created,
- * and is reported a NULL here.
+ * and is reported as NULL here.
*
* \param renderer the rendering context.
* \returns the current render target or NULL for the default render target.
--- a/vs2019_project/ft2-clone/sdl/include/SDL2/SDL_surface.h
+++ b/vs2019_project/ft2-clone/sdl/include/SDL2/SDL_surface.h
@@ -808,8 +808,8 @@
*
* This assumes that the source and destination rectangles are the same size.
* If either `srcrect` or `dstrect` are NULL, the entire surface (`src` or
- * `dst`) is copied. The final blit rectangles are saved in `srcrect` and
- * `dstrect` after all clipping is performed.
+ * `dst`) is copied. The final blit rectangle is saved in `dstrect` after
+ * all clipping is performed.
*
* The blit function should not be called on a locked surface.
*
--- a/vs2019_project/ft2-clone/sdl/include/SDL2/SDL_version.h
+++ b/vs2019_project/ft2-clone/sdl/include/SDL2/SDL_version.h
@@ -58,7 +58,7 @@
*/
#define SDL_MAJOR_VERSION 2
#define SDL_MINOR_VERSION 32
-#define SDL_PATCHLEVEL 2
+#define SDL_PATCHLEVEL 6
/**
* Macro to determine SDL version program was compiled against.
binary files a/vs2019_project/ft2-clone/sdl/lib/SDL2.lib b/vs2019_project/ft2-clone/sdl/lib/SDL2.lib differ
binary files a/vs2019_project/ft2-clone/sdl/lib/SDL2main.lib b/vs2019_project/ft2-clone/sdl/lib/SDL2main.lib differ
binary files a/vs2019_project/ft2-clone/sdl/lib64/SDL2.lib b/vs2019_project/ft2-clone/sdl/lib64/SDL2.lib differ
binary files a/vs2019_project/ft2-clone/sdl/lib64/SDL2main.lib b/vs2019_project/ft2-clone/sdl/lib64/SDL2main.lib differ
binary files a/vs2019_project/x64/Debug/SDL2.dll b/vs2019_project/x64/Debug/SDL2.dll differ
--
⑨