apple silcon build of the menu native library.

Author: davetcc

tcMenuNative/.idea/editor.xml

@@ -21,20 +21,18 @@ endif()
 add_library(tcMenuNative SHARED library.cpp FreeFontHandler.cpp)
 
 # Pull in the free type headers.
-if(UNIX AND NOT APPLE)
-#    I don't like this but for now we need to do this as the find_package doesn't
-#    correctly locate the includes.
-    target_include_directories(tcMenuNative PRIVATE /usr/include/freetype2)
+if(UNIX)
+    target_include_directories(tcMenuNative PRIVATE ${FREETYPE_INCLUDE_DIRS})
 else ()
     target_include_directories(tcMenuNative PRIVATE ${FREETYPE_DIR})
 endif ()
 
 if(UNIX)
     # On unix we need to link against the three libraries needed by freetype, these were found above using find_package
     target_link_libraries(tcMenuNative
-            ${FREETYPE_LIBRARY}
-            ${PNG_LIBRARY}
-            ${ZLIB_LIBRARY})
+            ${FREETYPE_LIBRARIES}
+            ${PNG_LIBRARIES}
+            ${ZLIB_LIBRARIES})
 else ()
     # on windows however, we need to build freetype from source in release mode as a static library. Consult the freetype
     # docs if you don't want to use the tcMenuPackaged one

tcMenuNative/.idea/fontGlyphGenerator.iml

@@ -4,11 +4,8 @@
 #include <vector>
 #include <map>
 #include "library.h"
-#if __has_include ("freetype/freetype.h")
-#include "freetype/freetype.h"
-#else
-#include "freetype2/freetype/freetype.h"
-#endif // free type include
+#include <ft2build.h>
+#include FT_FREETYPE_H
 
 class FreeFontHandler;