Fixed compilation of mathutils.

Author: jrfaeder

.github/workflows/validation.yml

@@ -108,9 +108,10 @@ jobs:
           # Set flags to make universal binaries
           export "CC=clang"
           export "CXX=clang++"
-          export "CFLAGS=-arch arm64"
-          export "CXXFLAGS=-arch arm64"
-          export "LDFLAGS=-arch arm64"
+          export "CFLAGS=-arch arm64 -arch x86_64"
+          export "CXXFLAGS=-arch arm64 -arch x86_64" 
+          export "LDFLAGS=-arch arm64 -arch x86_64"
+          export "CMAKE_OSX_ARCHITECTURES=arm64;x86_64"
           make
       # Linux compilation
       - name: Make-Linux

bng2/Network3/CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 2.8.4)
 
-set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64" CACHE STRING "Build universal binary" FORCE)
+#set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64" CACHE STRING "Build universal binary" FORCE)
 
 project(Network3)
 

bng2/Network3/Makefile.cmake

@@ -60,7 +60,7 @@ $(MUPARSER_LIB):
 
 $(MATHUTILS_LIB):
 	mkdir -p $(LIBDIR) $(INCDIR)
-	cd $(MATHUTILS); make CFLAGS=$(CFLAGS) LDFLAGS=$(LDFLAGS); \
+	cd $(MATHUTILS); make; \
 	mv libmathutils.a $(CMAKELISTS_DIR)/$(LIBDIR); \
 	cp mathutils.h $(CMAKELISTS_DIR)/$(INCDIR)