From 4de8f4953eb0b75e17800a707da0ad76f06b783f Mon Sep 17 00:00:00 2001
From: Alvaro Lobato <alvarolobato@gmail.com>
Date: Fri, 22 Dec 2023 00:02:05 +0100
Subject: [PATCH] Fix mac build: - Change compiler version so it works with
 newer MacOS - Fix library paths - Exclude freetype which creates a build
 error

---
 tools/osx_build_extra.py                     | 3 ++-
 user_setups/darwin_sdl/darwin_sdl_64bits.ini | 7 +++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/tools/osx_build_extra.py b/tools/osx_build_extra.py
index 3f445946..ae726458 100644
--- a/tools/osx_build_extra.py
+++ b/tools/osx_build_extra.py
@@ -1,6 +1,7 @@
 Import("env")
 
-env.Replace(CC="gcc-10", CXX="g++-10")
+#env.Replace(CC="gcc-10", CXX="g++-10")
+env.Replace(CC="gcc-12", CXX="g++-12")
 
 env.Replace(BUILD_SCRIPT="tools/osx_build_script.py")
 
diff --git a/user_setups/darwin_sdl/darwin_sdl_64bits.ini b/user_setups/darwin_sdl/darwin_sdl_64bits.ini
index 30819a31..a1e64062 100644
--- a/user_setups/darwin_sdl/darwin_sdl_64bits.ini
+++ b/user_setups/darwin_sdl/darwin_sdl_64bits.ini
@@ -58,8 +58,10 @@ build_flags =
   -lm
   -lpthread
   ; MacOS with Homebrew
-  -I/usr/local/include
-  -L/usr/local/lib
+  ;-I/usr/local/include
+  ;-L/usr/local/lib
+  -I/opt/homebrew/include
+  -L/opt/homebrew/lib
   -DTARGET_OS_MAC=1
 
 lib_deps =
@@ -77,6 +79,7 @@ lib_ignore =
   ArduinoLog
   lv_lib_qrcode
   ETHSPI
+  freetype
 
 build_src_filter =
   +<*>