SteamFrame/OpenVR-AdvancedSettings-frame
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove C++17 flags from g++ and clang

Browse Source 
The flags are already being applied by QMAKE.
This commit is contained in:
Vasily
2019-01-23 22:18:28 +01:00
parent 20341021c5
commit c0c824d380
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
advancedSettings.pro
+1 -2
View File
@@ -36,6 +36,7 @@ TEMPLATE = app
} }
win32-clang-msvc{ win32-clang-msvc{
#clang-msvc does not enable the c++17 flag with qmake's c++1z flag.
QMAKE_CXXFLAGS += /std:c++17 QMAKE_CXXFLAGS += /std:c++17
} }
@@ -43,7 +44,6 @@ win32-clang-msvc{
#g++-7 is needed for C++17 features. travis does not supply this by default. #g++-7 is needed for C++17 features. travis does not supply this by default.
QMAKE_CXX = g++-7 QMAKE_CXX = g++-7
QMAKE_CXXFLAGS += -Werror QMAKE_CXXFLAGS += -Werror
QMAKE_CXXFLAGS += -std=c++17
} }
#Look for anything clang that is not clang-msvc, since it does not #Look for anything clang that is not clang-msvc, since it does not
@@ -52,7 +52,6 @@ win32-clang-msvc{
QMAKE_CXXFLAGS += -Werror QMAKE_CXXFLAGS += -Werror
#All includes from the third-party directory will not warn. #All includes from the third-party directory will not warn.
QMAKE_CXXFLAGS += --system-header-prefix=third-party QMAKE_CXXFLAGS += --system-header-prefix=third-party
QMAKE_CXXFLAGS += -std=c++17
} }
SOURCES += src/main.cpp\ SOURCES += src/main.cpp\
src/overlaycontroller.cpp \ src/overlaycontroller.cpp \