Merge pull request #9102 from Chocobo1/cfg

Turn on Control Flow Guard for MSVC builds
6 years ago · 8da5ccee03
2 changed files with 6 additions and 1 deletions
--- a/conf.pri.windows
+++ b/conf.pri.windows
@ -61,3 +61,9 @@ DEFINES += BOOST_USE_WINAPI_VERSION=0x0501
				@@ -61,3 +61,9 @@ DEFINES += BOOST_USE_WINAPI_VERSION=0x0501

 # Enable stack trace support
 CONFIG += stacktrace
+
+win32-msvc* {
+    QMAKE_CXXFLAGS += "/guard:cf"
+    QMAKE_LFLAGS += "/guard:cf"
+    QMAKE_LFLAGS_RELEASE += "/OPT:REF /OPT:ICF"
+}
--- a/winconf.pri
+++ b/winconf.pri
@ -39,7 +39,6 @@ win32-g++* {
				@@ -39,7 +39,6 @@ win32-g++* {
 else:win32-msvc* {
    CONFIG -= embed_manifest_exe
    QMAKE_LFLAGS += "/MANIFEST:EMBED /MANIFESTINPUT:$$quote($${PWD}/src/qbittorrent.exe.manifest) /STACK:0x800000"
-    QMAKE_LFLAGS_RELEASE += "/OPT:REF /OPT:ICF"

    RC_FILE = qbittorrent.rc