Skip to content

Commit 23431a6

Browse files
committed
Windows/macOS: Update SDL to v2.32.8
1 parent e059bab commit 23431a6

File tree

13 files changed

+19
-11
lines changed

13 files changed

+19
-11
lines changed

release/macos/ft2-clone-macos.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_stdinc.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -750,8 +750,12 @@ size_t wcslcpy(wchar_t *dst, const wchar_t *src, size_t size);
750750
size_t wcslcat(wchar_t *dst, const wchar_t *src, size_t size);
751751
#endif
752752

753+
#ifndef _WIN32
753754
/* strdup is not ANSI but POSIX, and its prototype might be hidden... */
755+
/* not for windows: might conflict with string.h where strdup may have
756+
* dllimport attribute: https://github.com/libsdl-org/SDL/issues/12948 */
754757
char *strdup(const char *str);
758+
#endif
755759

756760
/* Starting LLVM 16, the analyser errors out if these functions do not have
757761
their prototype defined (clang-diagnostic-implicit-function-declaration) */

release/macos/ft2-clone-macos.app/Contents/Frameworks/SDL2.framework/Versions/A/Headers/SDL_version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ typedef struct SDL_version
5858
*/
5959
#define SDL_MAJOR_VERSION 2
6060
#define SDL_MINOR_VERSION 32
61-
#define SDL_PATCHLEVEL 6
61+
#define SDL_PATCHLEVEL 8
6262

6363
/**
6464
* Macro to determine SDL version program was compiled against.

release/macos/ft2-clone-macos.app/Contents/Frameworks/SDL2.framework/Versions/A/Resources/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@
1919
<key>CFBundlePackageType</key>
2020
<string>FMWK</string>
2121
<key>CFBundleShortVersionString</key>
22-
<string>2.32.6</string>
22+
<string>2.32.8</string>
2323
<key>CFBundleSignature</key>
2424
<string>SDLX</string>
2525
<key>CFBundleSupportedPlatforms</key>
2626
<array>
2727
<string>MacOSX</string>
2828
</array>
2929
<key>CFBundleVersion</key>
30-
<string>2.32.6</string>
30+
<string>2.32.8</string>
3131
<key>DTCompiler</key>
3232
<string>com.apple.compilers.llvm.clang.1_0</string>
3333
<key>DTPlatformBuild</key>

release/macos/ft2-clone-macos.app/Contents/Frameworks/SDL2.framework/Versions/A/_CodeSignature/CodeResources

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</data>
1515
<key>Resources/Info.plist</key>
1616
<data>
17-
Zda7B5zOlgXIAj0SZw10DI8J4zY=
17+
k6iPRu83txomCVW2hkW4G2hDQ1g=
1818
</data>
1919
<key>Resources/License.txt</key>
2020
<data>
@@ -618,11 +618,11 @@
618618
<dict>
619619
<key>hash</key>
620620
<data>
621-
ghpA/MCplmhdO4hJb25EXKh4+s4=
621+
MR36Ou7QO+u+7GznVL3XNQ8tJbw=
622622
</data>
623623
<key>hash2</key>
624624
<data>
625-
cSrXM8EyC4v/PujaxFfax4TvFm2zt24dFebf53otApM=
625+
MlrCfUryuPhjND16ZreSOSgu23XpXPQbhIDbuAfgvTQ=
626626
</data>
627627
</dict>
628628
<key>Headers/SDL_surface.h</key>
@@ -706,11 +706,11 @@
706706
<dict>
707707
<key>hash</key>
708708
<data>
709-
gPL2qjhQt9pswRR/UrpHYP61KNo=
709+
1l8NdLTxUdejo0BJoaYzT26luPQ=
710710
</data>
711711
<key>hash2</key>
712712
<data>
713-
5wMLgwuCEV//z0Hwsvs0UIsP9NcnMIH4jtOo6pMgtLE=
713+
S02B7eMdA0fmMGpiGOIFLSZkg8u0igKOQ1KpNe5PWCw=
714714
</data>
715715
</dict>
716716
<key>Headers/SDL_video.h</key>
@@ -783,11 +783,11 @@
783783
<dict>
784784
<key>hash</key>
785785
<data>
786-
Zda7B5zOlgXIAj0SZw10DI8J4zY=
786+
k6iPRu83txomCVW2hkW4G2hDQ1g=
787787
</data>
788788
<key>hash2</key>
789789
<data>
790-
tmWhV3TAUQkq3CfjDOIa/2S0mjQq6mtKeD/TSdsmAwo=
790+
BLH2X9CVHV4dezVVV5zrhFtDj3SOR9eDAiaypqvMaL4=
791791
</data>
792792
</dict>
793793
<key>Resources/License.txt</key>

release/win32/SDL2.dll

0 Bytes
Binary file not shown.

release/win64/SDL2.dll

0 Bytes
Binary file not shown.

vs2019_project/ft2-clone/SDL2.dll

0 Bytes
Binary file not shown.

vs2019_project/ft2-clone/sdl/include/SDL2/SDL_stdinc.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -750,8 +750,12 @@ size_t wcslcpy(wchar_t *dst, const wchar_t *src, size_t size);
750750
size_t wcslcat(wchar_t *dst, const wchar_t *src, size_t size);
751751
#endif
752752

753+
#ifndef _WIN32
753754
/* strdup is not ANSI but POSIX, and its prototype might be hidden... */
755+
/* not for windows: might conflict with string.h where strdup may have
756+
* dllimport attribute: https://github.com/libsdl-org/SDL/issues/12948 */
754757
char *strdup(const char *str);
758+
#endif
755759

756760
/* Starting LLVM 16, the analyser errors out if these functions do not have
757761
their prototype defined (clang-diagnostic-implicit-function-declaration) */

vs2019_project/ft2-clone/sdl/include/SDL2/SDL_version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ typedef struct SDL_version
5858
*/
5959
#define SDL_MAJOR_VERSION 2
6060
#define SDL_MINOR_VERSION 32
61-
#define SDL_PATCHLEVEL 6
61+
#define SDL_PATCHLEVEL 8
6262

6363
/**
6464
* Macro to determine SDL version program was compiled against.

0 commit comments

Comments
 (0)