diff options
| author | Fabio Alessandrelli <fabio.alessandrelli@gmail.com> | 2022-09-11 13:12:44 +0200 |
|---|---|---|
| committer | Fabio Alessandrelli <fabio.alessandrelli@gmail.com> | 2022-09-12 13:12:55 +0200 |
| commit | 081d425277535bd102709e0fea66565033a9227c (patch) | |
| tree | 91cd6497baaa7b8049a60b3233481c25aaba4b22 | |
| parent | e272d928271056634ed886c145731ab50ee07969 (diff) | |
| download | redot-cpp-081d425277535bd102709e0fea66565033a9227c.tar.gz | |
[MSVC] Add NOMINMAX flag to scons and cmake.
Ensures user inclusion of windows.h do not define "min" and "max"
macros.
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | test/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | tools/windows.py | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a0c6be6..cbfbfb1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -95,8 +95,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") # Disable conversion warning, truncation, unreferenced var, signed mismatch, different type set(GODOT_COMPILE_FLAGS "${GODOT_COMPILE_FLAGS} /wd4244 /wd4305 /wd4101 /wd4018 /wd4267 /wd4099") - # Todo: Check if needed. - add_definitions(-DWIN32_LEAN_AND_MEAN -D_CRT_SECURE_NO_WARNINGS) + add_definitions(-DNOMINMAX) # Unkomment for warning level 4 #if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]") diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 990a0f1..f229253 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -50,8 +50,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") # Disable conversion warning, truncation, unreferenced var, signed mismatch set(GODOT_COMPILE_FLAGS "${GODOT_COMPILE_FLAGS} /wd4244 /wd4305 /wd4101 /wd4018 /wd4267") - # Todo: Check if needed. - add_definitions(-DWIN32_LEAN_AND_MEAN -D_CRT_SECURE_NO_WARNINGS) + add_definitions(-DNOMINMAX) # Unkomment for warning level 4 #if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]") diff --git a/tools/windows.py b/tools/windows.py index 9c5ea6f..3d5d22e 100644 --- a/tools/windows.py +++ b/tools/windows.py @@ -24,7 +24,7 @@ def generate(env): env["TARGET_ARCH"] = "x86" env["is_msvc"] = True msvc.generate(env) - env.Append(CPPDEFINES=["TYPED_METHOD_BIND"]) + env.Append(CPPDEFINES=["TYPED_METHOD_BIND", "NOMINMAX"]) env.Append(LINKFLAGS=["/WX"]) if env["target"] == "debug": env.Append(CCFLAGS=["/Z7", "/Od", "/EHsc", "/D_DEBUG", "/MDd"]) |