From 5d4609bd0ee7854b27791c856ca7de93491232d1 Mon Sep 17 00:00:00 2001 From: sudden6 Date: Tue, 17 Jan 2017 17:30:30 +0100 Subject: [PATCH] fix(jenkins): preserve the correct linking order fix #4079 --- qtox.pro | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/qtox.pro b/qtox.pro index ed706007f..8228a2e54 100644 --- 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