Skip to content

Commit df962da

Browse files
AMDmi3bjorn
authored andcommitted
Fix library directory order
This moves path to -ltiled before system library locations, fixing the case where libtiled from (older) installed version of tiled is picked up instead of newly built one.
1 parent 92e22d4 commit df962da

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

src/automappingconverter/automappingconverter.pro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ macx {
1212
} else:win32 {
1313
LIBS += -L$$OUT_PWD/../../lib
1414
} else {
15-
QMAKE_LIBDIR += $$OUT_PWD/../../lib
15+
QMAKE_LIBDIR = $$OUT_PWD/../../lib $$QMAKE_LIBDIR
1616
}
1717

1818
# Make sure the executable can find libtiled

src/tiled/tiled.pro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ macx {
2525
} else:win32 {
2626
LIBS += -L$$OUT_PWD/../../lib
2727
} else {
28-
QMAKE_LIBDIR += $$OUT_PWD/../../lib
28+
QMAKE_LIBDIR = $$OUT_PWD/../../lib $$QMAKE_LIBDIR
2929
}
3030

3131
# Make sure the Tiled executable can find libtiled

src/tmxrasterizer/tmxrasterizer.pro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ macx {
2222
} else:win32 {
2323
LIBS += -L$$OUT_PWD/../../lib
2424
} else {
25-
QMAKE_LIBDIR += $$OUT_PWD/../../lib
25+
QMAKE_LIBDIR = $$OUT_PWD/../../lib $$QMAKE_LIBDIR
2626
}
2727

2828
# Make sure the executable can find libtiled

src/tmxviewer/tmxviewer.pro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ macx {
2222
} else:win32 {
2323
LIBS += -L$$OUT_PWD/../../lib
2424
} else {
25-
QMAKE_LIBDIR += $$OUT_PWD/../../lib
25+
QMAKE_LIBDIR = $$OUT_PWD/../../lib $$QMAKE_LIBDIR
2626
}
2727

2828
# Make sure the executable can find libtiled

0 commit comments

Comments
 (0)