Browse Source

fix(jenkins): preserve the correct linking order

fix #4079
reviewable/pr4081/r2
sudden6 9 years ago
parent
commit
5d4609bd0e
No known key found for this signature in database
GPG Key ID: 279509B499E032B9
  1. 26
      qtox.pro

26
qtox.pro

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

Loading…
Cancel
Save