From c482e90efc848680aa6555054f93230ec050ae19 Mon Sep 17 00:00:00 2001 From: Noah Date: Thu, 30 Sep 2021 16:18:34 +0200 Subject: [PATCH] Mesh: fix WildMagic4 build on Darwin AArch64 (Apple M1) A previous fix from 2012 excluded the x86_64 platfrom from using 32-bit Carbon APIs. - https://tracker.freecadweb.org/view.php?id=656 (WildMagic4 doesn't build on 64-bit Mac OS) Apply the same fix for AArch64 to ensure that the Mesh module can be built on Apple M1. --- src/Mod/Mesh/App/WildMagic4/Wm4System.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Mod/Mesh/App/WildMagic4/Wm4System.cpp b/src/Mod/Mesh/App/WildMagic4/Wm4System.cpp index c68f78c959..0f5fd76c5f 100644 --- a/src/Mod/Mesh/App/WildMagic4/Wm4System.cpp +++ b/src/Mod/Mesh/App/WildMagic4/Wm4System.cpp @@ -569,7 +569,7 @@ int System::Write8be (FILE* pkFile, int iQuantity, const void* pvData) const char* System::GetPath (const char* acDirectory, const char* acFilename) { // #0000656: WildMagic4 doesn't build on 64-bit Mac OS -#if defined(__APPLE__) && !defined(__x86_64__) +#if defined(__APPLE__) && !defined(__aarch64__) && !defined(__x86_64__) // An application-relative path is needed for the applications to be able // to find the input data sets. Unfortunately, there is no exact way to // predict which directory the application is run from, since this depends