Skip to content

Commit bba9ca3

Browse files
author
Stefano Bianchi
committed
rpath for local libraries
1 parent a4b975d commit bba9ca3

File tree

265 files changed

+8
-12
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

265 files changed

+8
-12
lines changed
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

app/app.pro

+4-8
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
11
TEMPLATE = app
22
TARGET = FATool
33
macx: {
4-
ICON = icons/logo.icns
4+
ICON = ../icons/logo.icns
55
}
66

7-
#unix:!macx {
8-
# INCLUDEPATH += usr/include
9-
# LIBS += -L/lib/x86_64-linux-gnu -lgsl -lgslcblas -lm
10-
#}
11-
127
unix:!macx {
13-
INCLUDEPATH += includes
14-
LIBS += -Llibs/ -lgsl -lgslcblas -lm
8+
INCLUDEPATH += ../3rd_party/includes
9+
LIBS += -L../3rd_party/ubuntu/libs/ -lgsl -lgslcblas -lm
10+
QMAKE_RPATHDIR += ../lib/fatool
1511
}
1612

1713
macx: {

app/icons/logo.eps icons/logo.eps

File renamed without changes.
File renamed without changes.

icons/logo_128.png

5.51 KB

icons/logo_16.png

688 Bytes

icons/logo_24.png

983 Bytes

icons/logo_256.png

11 KB

icons/logo_32.png

1.3 KB

icons/logo_48.png

2.02 KB

icons/logo_512.png

24.3 KB

icons/logo_64.png

2.69 KB

tests/fa/fa.pro

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

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

1313
macx: {

tests/gui/gui.pro

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

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

1313
macx: {

0 commit comments

Comments
 (0)