1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00

fix(jenkins): preserve the correct linking order

fix #4079
This commit is contained in:
sudden6 2017-01-17 17:30:30 +01:00
parent 482757e6a2
commit 5d4609bd0e
No known key found for this signature in database
GPG Key ID: 279509B499E032B9

View File

@ -128,8 +128,20 @@ win32 {
LIBS += -L$$PWD/libs/lib \ LIBS += -L$$PWD/libs/lib \
-ltoxav \ -ltoxav \
-ltoxcore \ -ltoxcore \
-ltoxencryptsave \ -ltoxencryptsave
-lsodium \
# must be exactly here, to preserve link order
contains(TOX_CMAKE, YES) {
LIBS += -ltoxgroup \
-ltoxmessenger \
-ltoxfriends \
-ltoxnetcrypto \
-ltoxdht \
-ltoxnetwork \
-ltoxcrypto
}
LIBS += -lsodium \
-lvpx \ -lvpx \
-lpthread \ -lpthread \
-lavdevice \ -lavdevice \
@ -152,16 +164,6 @@ win32 {
-lshlwapi \ -lshlwapi \
-luuid -luuid
LIBS += -lstrmiids # For DirectShow LIBS += -lstrmiids # For DirectShow
contains(TOX_CMAKE, YES) {
LIBS += -ltoxgroup \
-ltoxmessenger \
-ltoxfriends \
-ltoxnetcrypto \
-ltoxdht \
-ltoxnetwork \
-ltoxcrypto
}
} else { } else {
macx { macx {
BUNDLEID = chat.tox.qtox BUNDLEID = chat.tox.qtox