Merge pull request #96244 from Repiteo/scons/msvc-__cplusplus

SCons: Pass `/Zc:__cplusplus` in MSVC builds
This commit is contained in:
Rémi Verschelde 2024-09-05 19:42:51 +02:00
commit a8e3feb788
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 5 additions and 0 deletions

View File

@ -791,6 +791,8 @@ else:
# Note that this is still not complete conformance, as certain Windows-related headers
# don't compile under complete conformance.
env.Prepend(CCFLAGS=["/permissive-"])
# Allow use of `__cplusplus` macro to determine C++ standard universally.
env.Prepend(CXXFLAGS=["/Zc:__cplusplus"])
# Disable exception handling. Godot doesn't use exceptions anywhere, and this
# saves around 20% of binary size and very significant build time (GH-80513).

View File

@ -44,6 +44,9 @@
#include "core/error/error_list.h"
#include <cstdint>
// Ensure that C++ standard is at least C++17. If on MSVC, also ensures that the `Zc:__cplusplus` flag is present.
static_assert(__cplusplus >= 201703L);
// Turn argument to string constant:
// https://gcc.gnu.org/onlinedocs/cpp/Stringizing.html#Stringizing
#ifndef _STR