fix(jenkins): preserve the correct linking order

fix #4079
2024-03-22 14:00:36 +08:00 · 2017-01-17 17:30:30 +01:00 · 2017-01-17 17:30:30 +01:00 · 5d4609bd0e
commit 5d4609bd0e
parent 482757e6a2
1 changed files with 14 additions and 12 deletions
--- a/qtox.pro
+++ b/qtox.pro
@ -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 {
            -lshlwapi \
            -luuid
    LIBS += -lstrmiids # For DirectShow
-
-    contains(TOX_CMAKE, YES) {
-        LIBS += -ltoxgroup \
-                -ltoxmessenger \
-                -ltoxfriends \
-                -ltoxnetcrypto \
-                -ltoxdht \
-                -ltoxnetwork \
-                -ltoxcrypto
-    }
 } else {
    macx {
        BUNDLEID = chat.tox.qtox