From 1eca27f9669d4a44ce95cb748f7a9874e628b7b1 Mon Sep 17 00:00:00 2001 From: bherdm Date: Thu, 2 Jan 2025 11:16:12 -0600 Subject: [PATCH] OSX: Fix compiling with Xcode 16 on macOS 15 Updated a line in the included FreeType 1.8.1 from FreeType 1.12.0+ to be compatible with Xcode 16. --- thirdparty/freetype/patches/xcode16-compat.patch | 13 +++++++++++++ thirdparty/freetype/src/gzip/ftzconf.h | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 thirdparty/freetype/patches/xcode16-compat.patch diff --git a/thirdparty/freetype/patches/xcode16-compat.patch b/thirdparty/freetype/patches/xcode16-compat.patch new file mode 100644 index 00000000000..d68e451101e --- /dev/null +++ b/thirdparty/freetype/patches/xcode16-compat.patch @@ -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 */ diff --git a/thirdparty/freetype/src/gzip/ftzconf.h b/thirdparty/freetype/src/gzip/ftzconf.h index 3abf0ba03b0..d88a82a2eec 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 */