seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OSX: Fix compiling with Xcode 16 on macOS 15

Browse Source 
Updated a line in the included FreeType 1.8.1 from FreeType 1.12.0+ to be compatible with Xcode 16.
This commit is contained in:
bherdm
2025-01-02 11:16:12 -06:00
committed by Rémi Verschelde
parent 64a9c5ac65
commit 1eca27f966
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
thirdparty/freetype/patches/xcode16-compat.patch vendored Normal file
View File

@ -0,0 +1,13 @@
diff --git a/thirdparty/freetype/src/gzip/ftzconf.h b/thirdparty/freetype/src/gzip/ftzconf.h
index 3abf0ba03b..d88a82a2ee 100644
--- a/thirdparty/freetype/src/gzip/ftzconf.h
+++ b/thirdparty/freetype/src/gzip/ftzconf.h
@@ -215,7 +215,7 @@
# define FAR
#endif
-#if !defined(MACOS) && !defined(TARGET_OS_MAC)
+#if !defined(__MACTYPES__)
typedef unsigned char Byte; /* 8 bits */
#endif
typedef unsigned int uInt; /* 16 bits or more */

2
thirdparty/freetype/src/gzip/ftzconf.h vendored
View File

@ -215,7 +215,7 @@
# define FAR
#endif
#if !defined(MACOS) && !defined(TARGET_OS_MAC)
#if !defined(__MACTYPES__)
typedef unsigned char Byte; /* 8 bits */
#endif
typedef unsigned int uInt; /* 16 bits or more */