From debb6e9cc897de62687ad39880059472d0eb8e48 Mon Sep 17 00:00:00 2001 From: tux3 Date: Mon, 2 Jan 2017 17:32:34 +0100 Subject: [PATCH] fix: Jenkins Windows builds --- qtox.pro | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/qtox.pro b/qtox.pro index e3fcd8d7c..70720aa68 100644 --- a/qtox.pro +++ b/qtox.pro @@ -46,12 +46,19 @@ CONFIG += silent # Hardening flags (ASLR, warnings, etc) # TODO: add `-Werror` to hardening flags once all warnings are fixed -QMAKE_CXXFLAGS += -fstack-protector-all \ - -fPIE \ - -Wstack-protector \ - -Wstrict-overflow \ - -Wstrict-aliasing \ - --param ssp-buffer-size=1 +win32 { + QMAKE_CXXFLAGS += -fPIE \ + -Wstrict-overflow \ + -Wstrict-aliasing +} else { + QMAKE_CXXFLAGS += -fstack-protector-all \ + -fPIE \ + -Wstack-protector \ + -Wstrict-overflow \ + -Wstrict-aliasing \ + --param ssp-buffer-size=1 +} + # osx & windows cannot into security (build on it fails with those enabled) unix:!macx { QMAKE_LFLAGS += -Wl,-z,now -Wl,-z,relro @@ -273,6 +280,13 @@ win32 { ./libs/lib/libopus.a \ ./libs/lib/libtoxencryptsave.a \ ./libs/lib/libtoxcore.a \ + ./libs/lib/libtoxgroup.a \ + ./libs/lib/libtoxmessenger.a \ + ./libs/lib/libtoxfriends.a \ + ./libs/lib/libtoxnetcrypto.a \ + ./libs/lib/libtoxdht.a \ + ./libs/lib/libtoxnetwork.a \ + ./libs/lib/libtoxcrypto.a \ ./libs/lib/libopenal.a \ ./libs/lib/libsodium.a \ ./libs/lib/libavdevice.a \