summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2018-08-24 20:02:53 +0200
committerGitHub <noreply@github.com>2018-08-24 20:02:53 +0200
commitff81b2daeac1bbb3a65482f7bf174e569fbb69be (patch)
tree5277fb9404ea6bbf74e5bd9076c4870fdc8db469
parent62233423c7310a155e8c948c053701dba248dcdb (diff)
parent72384626015f1990ab2009cdc99c32edf086c305 (diff)
Merge pull request #21375 from akien-mga/msvc-nominmax
SCons: Disable min/max WinDef.h macros on MSVC
-rw-r--r--platform/windows/detect.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/platform/windows/detect.py b/platform/windows/detect.py
index dcd3597e88..150d418502 100644
--- a/platform/windows/detect.py
+++ b/platform/windows/detect.py
@@ -210,6 +210,7 @@ def configure_msvc(env, manual_msvc_config):
'WIN32', 'MSVC',
{'WINVER' : '$target_win_version',
'_WIN32_WINNT': '$target_win_version'}])
+ env.AppendUnique(CPPDEFINES=['NOMINMAX']) # disable bogus min/max WinDef.h macros
if env["bits"] == "64":
env.AppendUnique(CPPDEFINES=['_WIN64'])