Skip to content

Commit 6ba30d8

Browse files
committed
macos deployment scripts
1 parent 075a1be commit 6ba30d8

10 files changed

+25
-9
lines changed

3rd_party/macos/libs/libgsl.25.dylib

2.1 MB
Binary file not shown.

3rd_party/macos/libs/libgsl.a

3.69 MB
Binary file not shown.

3rd_party/macos/libs/libgsl.dylib

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
libgsl.25.dylib
219 KB
Binary file not shown.

3rd_party/macos/libs/libgslcblas.a

331 KB
Binary file not shown.
+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
libgslcblas.0.dylib

app/app.pro

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ unix:!macx {
1212

1313
macx: {
1414
INCLUDEPATH += ../3rd_party/includes
15-
LIBS += -L../3rd_party/macos/libs/ -lgsl -lgslcblas -lm
15+
LIBS += -L$$PWD/../3rd_party/macos/libs/ -lgsl -lgslcblas -lm
1616
}
1717

1818
QT = core gui

macos_deployment.sh

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#!/bin/sh
2+
3+
QT_DIR="$1"
4+
BUILD_DIR="$2"
5+
6+
# in case it does not exist
7+
mkdir -p "$BUILD_DIR/app/release/FATool.app/Contents/Frameworks"
8+
9+
# copy 3rd party libraries
10+
cp ./3rd_party/macos/libs/* "$BUILD_DIR/app/release/FATool.app/Contents/Frameworks"
11+
12+
# qt frameworks
13+
cd "$QT_DIR/bin"
14+
./macdeployqt "$BUILD_DIR/app/release/FATool.app" -dmg

tests/fa/fa.pro

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ APPDIR = ../../app
66
INCLUDEPATH += $$APPDIR
77

88
unix:!macx {
9-
INCLUDEPATH += ../../includes
10-
LIBS += -L../../libs/ -lgsl -lgslcblas -lm
9+
INCLUDEPATH += ../../3rd_party/includes
10+
LIBS += -L../../3rd_party/ubuntu/libs/ -lgsl -lgslcblas -lm
1111
}
1212

1313
macx: {
14-
INCLUDEPATH += ../3rd_party/includes
15-
LIBS += -L../3rd_party/macos/libs/ -lgsl -lgslcblas -lm
14+
INCLUDEPATH += ../../3rd_party/includes
15+
LIBS += -L$$PWD/../../3rd_party/macos/libs/ -lgsl -lgslcblas -lm
1616
}
1717

1818
QT = core testlib

tests/gui/gui.pro

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ APPDIR = ../../app
66
INCLUDEPATH += $$APPDIR
77

88
unix:!macx {
9-
INCLUDEPATH += ../../includes
10-
LIBS += -L../../libs/ -lgsl -lgslcblas -lm
9+
INCLUDEPATH += ../../3rd_party/includes
10+
LIBS += -L../../3rd_party/ubuntu/libs/ -lgsl -lgslcblas -lm
1111
}
1212

1313
macx: {
14-
INCLUDEPATH += ../3rd_party/includes
15-
LIBS += -L../3rd_party/macos/libs/ -lgsl -lgslcblas -lm
14+
INCLUDEPATH += ../../3rd_party/includes
15+
LIBS += -L$$PWD/../../3rd_party/macos/libs/ -lgsl -lgslcblas -lm
1616
}
1717

1818
QT = core testlib

0 commit comments

Comments
 (0)