Unverified Commit 08fc6c56 authored by Rick V's avatar Rick V Committed by jeff
Browse files

fix windows build, which somehow mostly works

parent a5e66ee0
......@@ -18,7 +18,8 @@ HARDENED_MINGW_64ASLR_FLAGS = -Wl,--dynamicbase -Wl,--high-entropy-va
# Run tests and apply options where possible
CONFIG(hardened) {
# mingw is always PIC, and complains about the flag
!mingw:HARDEN_FLAGS = -fPIC
# Microsoft C++ doesn't even know what PIC _is_
!mingw:!win32:HARDEN_FLAGS = -fPIC
CONFIG(debug,debug|release): qtCompileTest(sanitize):HARDEN_FLAGS += $$HARDENED_SANITIZE_FLAGS
qtCompileTest(sanitize-ubsan):HARDEN_FLAGS += $$HARDENED_SANITIZE_UBSAN_FLAGS
......
......@@ -147,7 +147,7 @@ win32 {
}
# required by openssl
LIBS += -luser32 -lgdi32 -ladvapi32
LIBS += -luser32 -lgdi32 -ladvapi32 -lws2_32
}
# Exclude unneeded plugins from static builds
......
......@@ -37,6 +37,7 @@
#include <limits.h>
#ifdef Q_OS_WIN
#include <windows.h>
#include <wincrypt.h>
#endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment