From 2b0529ab7da2172108175ae7c0855801789da817 Mon Sep 17 00:00:00 2001 From: Jan Date: Thu, 1 Apr 2021 15:11:39 +0200 Subject: [PATCH] Make sure the code is considered c++17 because using msvc c++20 breaks existing code and no c++20 features are actually being used --- premake5.lua | 5 +---- src/STDInclude.hpp | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/premake5.lua b/premake5.lua index 28eafda6..ea000824 100644 --- a/premake5.lua +++ b/premake5.lua @@ -456,10 +456,7 @@ workspace "iw4x" --iw4mvm.project() workspace "*" - buildoptions { - "/std:c++latest" - } - systemversion "latest" + cppdialect "C++17" defines { "_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS" } rule "ProtobufCompiler" diff --git a/src/STDInclude.hpp b/src/STDInclude.hpp index 872e40c3..38a4a204 100644 --- a/src/STDInclude.hpp +++ b/src/STDInclude.hpp @@ -5,8 +5,8 @@ #ifndef RC_INVOKED -#define _HAS_CXX17 1 -#define _HAS_CXX20 1 +//#define _HAS_CXX17 1 +//#define _HAS_CXX20 1 #define VC_EXTRALEAN #define WIN32_LEAN_AND_MEAN #define _CRT_SECURE_NO_WARNINGS