Skip to content

Commit 0ff5012

Browse files
committed
Fix mac build
1 parent f6255ff commit 0ff5012

4 files changed

Lines changed: 11 additions & 12 deletions

File tree

AuTerm-includes.pri

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
# AuTerm global include qmake project settings
22
# By default all components are built for Github AuTerm releases
33

4+
# Build for x86_64 and arm64 on mac
5+
QMAKE_APPLE_DEVICE_ARCHS = x86_64 arm64
6+
47
# Uncomment to exclude building automation form
58
#DEFINES += "SKIPAUTOMATIONFORM"
69

AuTerm/AuTerm.pro

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,11 @@ CONFIG(release, debug|release) {
9494
DEFINES += "STATICPLUGIN_MCUMGR"
9595

9696
win32: LIBS += -L$$DESTDIR -lplugin_mcumgr
97-
else:unix: LIBS += -L$$DESTDIR -lplugin_mcumgr
97+
else: LIBS += -L$$DESTDIR -lplugin_mcumgr
9898

9999
win32-g++: PRE_TARGETDEPS += $$DESTDIR/libplugin_mcumgr.a
100100
else:win32:!win32-g++: PRE_TARGETDEPS += $$DESTDIR/plugin_mcumgr.lib
101-
else:unix: PRE_TARGETDEPS += $$DESTDIR/libplugin_mcumgr.a
101+
else: PRE_TARGETDEPS += $$DESTDIR/libplugin_mcumgr.a
102102
}
103103
}
104104

@@ -107,11 +107,11 @@ CONFIG(release, debug|release) {
107107
DEFINES += "STATICPLUGIN_LOGGER"
108108

109109
win32: LIBS += -L$$DESTDIR -lplugin_logger
110-
else:unix: LIBS += -L$$DESTDIR -lplugin_logger
110+
else: LIBS += -L$$DESTDIR -lplugin_logger
111111

112112
win32-g++: PRE_TARGETDEPS += $$DESTDIR/libplugin_logger.a
113113
else:win32:!win32-g++: PRE_TARGETDEPS += $$DESTDIR/plugin_logger.lib
114-
else:unix: PRE_TARGETDEPS += $$DESTDIR/libplugin_logger.a
114+
else: PRE_TARGETDEPS += $$DESTDIR/libplugin_logger.a
115115
}
116116
}
117117
}

plugins/logger/logger.pro

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,9 @@ CONFIG += install_ok # Do not cargo-cult this!
3636

3737
# Common build location
3838
CONFIG(release, debug|release) {
39-
macx: DESTDIR = ../../release/AuTerm.app/Frameworks
40-
else: DESTDIR = ../../release
39+
DESTDIR = ../../release
4140
} else {
42-
macx: DESTDIR = ../../debug/AuTerm.app/Frameworks
43-
else: DESTDIR = ../../debug
41+
DESTDIR = ../../debug
4442
}
4543

4644
# Do not prefix with lib for non-static builds

plugins/mcumgr/mcumgr.pro

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,9 @@ CONFIG += install_ok # Do not cargo-cult this!
7272

7373
# Common build location
7474
CONFIG(release, debug|release) {
75-
macx: DESTDIR = ../../release/AuTerm.app/Frameworks
76-
else: DESTDIR = ../../release
75+
DESTDIR = ../../release
7776
} else {
78-
macx: DESTDIR = ../../debug/AuTerm.app/Frameworks
79-
else: DESTDIR = ../../debug
77+
DESTDIR = ../../debug
8078

8179

8280
# The following form is only used for creating the GUI in Qt Creator, it is

0 commit comments

Comments
 (0)