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

Merge pull request #4037

tux3 (1):
      fix: Jenkins Windows builds
This commit is contained in:
tux3 2017-01-02 18:02:37 +01:00
commit 123785cf52
No known key found for this signature in database
GPG Key ID: 7E086DD661263264

View File

@ -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 \