diff options
| author | Rick V <rick@snowlight.net> | 2020-02-04 17:16:04 -0600 |
|---|---|---|
| committer | Jeff Becker <jeff@i2p.rocks> | 2020-02-19 10:38:43 -0500 |
| commit | 08fc6c56e1cd3c28585177db8fadac3f2a03e920 (patch) | |
| tree | b0cab3317fdfceba5c769e9e0eb10a15f2ef7215 | |
| parent | a5e66ee0a3afaec7985b06d3da35fbdd0199ad6e (diff) | |
fix windows build, which somehow mostly works
| -rwxr-xr-x | hardened.pri | 3 | ||||
| -rwxr-xr-x | ricochet.pro | 2 | ||||
| -rwxr-xr-x | src/utils/SecureRNG.cpp | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/hardened.pri b/hardened.pri index d0c5f2e..32a2a9b 100755 --- a/hardened.pri +++ b/hardened.pri @@ -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 diff --git a/ricochet.pro b/ricochet.pro index cc2af86..1db33d1 100755 --- a/ricochet.pro +++ b/ricochet.pro @@ -147,7 +147,7 @@ win32 { } # required by openssl - LIBS += -luser32 -lgdi32 -ladvapi32 + LIBS += -luser32 -lgdi32 -ladvapi32 -lws2_32 } # Exclude unneeded plugins from static builds diff --git a/src/utils/SecureRNG.cpp b/src/utils/SecureRNG.cpp index 3a6eacd..95246bd 100755 --- a/src/utils/SecureRNG.cpp +++ b/src/utils/SecureRNG.cpp @@ -37,6 +37,7 @@ #include <limits.h> #ifdef Q_OS_WIN +#include <windows.h> #include <wincrypt.h> #endif |