From 1c3fd4d16fcedd553a12aac8b0bfe495074e3910 Mon Sep 17 00:00:00 2001 From: Joan Karadimov Date: Sun, 10 Oct 2021 20:47:58 +0300 Subject: [PATCH] Do not pass MSVC arguments to mingw/gcc --- YACReader/YACReader.pro | 6 ++++-- YACReaderLibrary/YACReaderLibrary.pro | 6 ++++-- YACReaderLibraryServer/YACReaderLibraryServer.pro | 6 ++++-- config.pri | 3 ++- tests/compressed_archive_test/compressed_archive_test.pro | 6 ++++-- 5 files changed, 18 insertions(+), 9 deletions(-) diff --git a/YACReader/YACReader.pro b/YACReader/YACReader.pro index fe2f6c7b..771ef583 100644 --- a/YACReader/YACReader.pro +++ b/YACReader/YACReader.pro @@ -57,8 +57,10 @@ win32 { LIBS += -loleaut32 -lole32 -lshell32 -lopengl32 -luser32 } - QMAKE_CXXFLAGS_RELEASE += /MP /Ob2 /Oi /Ot /GT /GL - QMAKE_LFLAGS_RELEASE += /LTCG + msvc { + QMAKE_CXXFLAGS_RELEASE += /MP /Ob2 /Oi /Ot /GT /GL + QMAKE_LFLAGS_RELEASE += /LTCG + } CONFIG -= embed_manifest_exe } diff --git a/YACReaderLibrary/YACReaderLibrary.pro b/YACReaderLibrary/YACReaderLibrary.pro index d5994578..b72f8ceb 100644 --- a/YACReaderLibrary/YACReaderLibrary.pro +++ b/YACReaderLibrary/YACReaderLibrary.pro @@ -38,8 +38,10 @@ win32 { LIBS += -loleaut32 -lole32 -lshell32 -lopengl32 -luser32 } - QMAKE_CXXFLAGS_RELEASE += /MP /Ob2 /Oi /Ot /GT /GL - QMAKE_LFLAGS_RELEASE += /LTCG + msvc { + QMAKE_CXXFLAGS_RELEASE += /MP /Ob2 /Oi /Ot /GT /GL + QMAKE_LFLAGS_RELEASE += /LTCG + } CONFIG -= embed_manifest_exe } diff --git a/YACReaderLibraryServer/YACReaderLibraryServer.pro b/YACReaderLibraryServer/YACReaderLibraryServer.pro index 6978b181..fd892f1d 100644 --- a/YACReaderLibraryServer/YACReaderLibraryServer.pro +++ b/YACReaderLibraryServer/YACReaderLibraryServer.pro @@ -20,8 +20,10 @@ greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat win32 { LIBS += -loleaut32 -lole32 -lshell32 -luser32 - QMAKE_CXXFLAGS_RELEASE += /MP /Ob2 /Oi /Ot /GT /GL - QMAKE_LFLAGS_RELEASE += /LTCG + msvc { + QMAKE_CXXFLAGS_RELEASE += /MP /Ob2 /Oi /Ot /GT /GL + QMAKE_LFLAGS_RELEASE += /LTCG + } CONFIG -= embed_manifest_exe } diff --git a/config.pri b/config.pri index 6259bd13..3fe09a27 100644 --- a/config.pri +++ b/config.pri @@ -6,7 +6,8 @@ CONFIG += c++17 win32:QMAKE_CXXFLAGS += /std:c++17 #enable c++17 explicitly in msvc unix:QMAKE_CXXFLAGS_RELEASE += -DNDEBUG -win32:QMAKE_CXXFLAGS_RELEASE += /DNDEBUG +mingw:QMAKE_CXXFLAGS_RELEASE += -DNDEBUG +win32:msvc:QMAKE_CXXFLAGS_RELEASE += /DNDEBUG # check Qt version defineTest(minQtVersion) { diff --git a/tests/compressed_archive_test/compressed_archive_test.pro b/tests/compressed_archive_test/compressed_archive_test.pro index 585ca9c8..9fd3f52e 100644 --- a/tests/compressed_archive_test/compressed_archive_test.pro +++ b/tests/compressed_archive_test/compressed_archive_test.pro @@ -8,8 +8,10 @@ QT += core win32 { LIBS += -loleaut32 -lole32 - QMAKE_CXXFLAGS_RELEASE += /MP /Ob2 /Oi /Ot /GT - QMAKE_LFLAGS_RELEASE += /LTCG + msvc { + QMAKE_CXXFLAGS_RELEASE += /MP /Ob2 /Oi /Ot /GT + QMAKE_LFLAGS_RELEASE += /LTCG + } CONFIG -= embed_manifest_exe }