diff options
| author | Spartan322 <Megacake1234@gmail.com> | 2024-10-22 06:56:34 -0400 |
|---|---|---|
| committer | Spartan322 <Megacake1234@gmail.com> | 2024-10-22 06:56:34 -0400 |
| commit | 9a93ab2506a3544bf48ef1c2b2d7e3d6f0dffedb (patch) | |
| tree | 961ebbb6fed86a794ff4446a848a359a6cd3fd4e /SConstruct | |
| parent | 9a49cab65c8e8ed8ac5f0613d96ddde403d12728 (diff) | |
| parent | b3bcb2dc14691f7729984128dca26a844f662fa1 (diff) | |
| download | redot-engine-9a93ab2506a3544bf48ef1c2b2d7e3d6f0dffedb.tar.gz | |
Merge commit godotengine/godot@b3bcb2dc14691f7729984128dca26a844f662fa1
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/SConstruct b/SConstruct index f9b1416e2f..9b5380db63 100644 --- a/SConstruct +++ b/SConstruct @@ -799,8 +799,8 @@ if env["lto"] != "none": # This needs to come after `configure`, otherwise we don't have env.msvc. if not env.msvc: # Specifying GNU extensions support explicitly, which are supported by - # both GCC and Clang. Both currently default to gnu11 and gnu++17. - env.Prepend(CFLAGS=["-std=gnu11"]) + # both GCC and Clang. Both currently default to gnu17 and gnu++17. + env.Prepend(CFLAGS=["-std=gnu17"]) env.Prepend(CXXFLAGS=["-std=gnu++17"]) else: # MSVC started offering C standard support with Visual Studio 2019 16.8, which covers all @@ -809,7 +809,7 @@ else: if cc_version_major < 16: print_warning("Visual Studio 2017 cannot specify a C-Standard.") else: - env.Prepend(CFLAGS=["/std:c11"]) + env.Prepend(CFLAGS=["/std:c17"]) # MSVC is non-conforming with the C++ standard by default, so we enable more conformance. # Note that this is still not complete conformance, as certain Windows-related headers # don't compile under complete conformance. |