Fix mac build

thedjnK · Sep 21, 2024 · 0ff5012 · 0ff5012
1 parent f6255ff
commit 0ff5012
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 12 deletions.
diff --git a/AuTerm-includes.pri b/AuTerm-includes.pri
@@ -1,6 +1,9 @@
 # AuTerm global include qmake project settings
 # By default all components are built for Github AuTerm releases
 
+# Build for x86_64 and arm64 on mac
+QMAKE_APPLE_DEVICE_ARCHS = x86_64 arm64
+
 # Uncomment to exclude building automation form
 #DEFINES += "SKIPAUTOMATIONFORM"
 

diff --git a/AuTerm/AuTerm.pro b/AuTerm/AuTerm.pro
@@ -94,11 +94,11 @@ CONFIG(release, debug|release) {
                 DEFINES += "STATICPLUGIN_MCUMGR"
 
 		win32: LIBS += -L$$DESTDIR -lplugin_mcumgr
-		else:unix: LIBS += -L$$DESTDIR -lplugin_mcumgr
+		else: LIBS += -L$$DESTDIR -lplugin_mcumgr
 
 		win32-g++: PRE_TARGETDEPS += $$DESTDIR/libplugin_mcumgr.a
 		else:win32:!win32-g++: PRE_TARGETDEPS += $$DESTDIR/plugin_mcumgr.lib
-		else:unix: PRE_TARGETDEPS += $$DESTDIR/libplugin_mcumgr.a
+		else: PRE_TARGETDEPS += $$DESTDIR/libplugin_mcumgr.a
             }
         }
 
@@ -107,11 +107,11 @@ CONFIG(release, debug|release) {
 		DEFINES += "STATICPLUGIN_LOGGER"
 
 		win32: LIBS += -L$$DESTDIR -lplugin_logger
-		else:unix: LIBS += -L$$DESTDIR -lplugin_logger
+		else: LIBS += -L$$DESTDIR -lplugin_logger
 
 		win32-g++: PRE_TARGETDEPS += $$DESTDIR/libplugin_logger.a
 		else:win32:!win32-g++: PRE_TARGETDEPS += $$DESTDIR/plugin_logger.lib
-		else:unix: PRE_TARGETDEPS += $$DESTDIR/libplugin_logger.a
+		else: PRE_TARGETDEPS += $$DESTDIR/libplugin_logger.a
 	    }
 	}
     }

diff --git a/plugins/logger/logger.pro b/plugins/logger/logger.pro
@@ -36,11 +36,9 @@ CONFIG += install_ok  # Do not cargo-cult this!
 
 # Common build location
 CONFIG(release, debug|release) {
-    macx: DESTDIR = ../../release/AuTerm.app/Frameworks
-    else: DESTDIR = ../../release
+    DESTDIR = ../../release
 } else {
-    macx: DESTDIR = ../../debug/AuTerm.app/Frameworks
-    else: DESTDIR = ../../debug
+    DESTDIR = ../../debug
 }
 
 # Do not prefix with lib for non-static builds

diff --git a/plugins/mcumgr/mcumgr.pro b/plugins/mcumgr/mcumgr.pro
@@ -72,11 +72,9 @@ CONFIG += install_ok  # Do not cargo-cult this!
 
 # Common build location
 CONFIG(release, debug|release) {
-    macx: DESTDIR = ../../release/AuTerm.app/Frameworks
-    else: DESTDIR = ../../release
+    DESTDIR = ../../release
 } else {
-    macx: DESTDIR = ../../debug/AuTerm.app/Frameworks
-    else: DESTDIR = ../../debug
+    DESTDIR = ../../debug
 
 
     # The following form is only used for creating the GUI in Qt Creator, it is