godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-07 12:30:27 +00:00
Code Releases Wiki Activity

Merge pull request #108613 from Repiteo/scons/fix-defines

Browse Source 
SCons: Ensure `CPPDEFINES` is properly utilized
This commit is contained in:
Thaddeus Crews
2025-09-16 11:44:45 -05:00
parent 697474baad 61956f2e06
commit 4dec6af2c8
9 changed files with 80 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
platform/windows/detect.py
View File

@@ -362,8 +362,8 @@ def configure_msvc(env: "SConsEnvironment"):
"WINMIDI_ENABLED",
"TYPED_METHOD_BIND",
"WIN32",
"WINVER=0x0A00",
"_WIN32_WINNT=0x0A00",
("WINVER", "0x0A00"),
("_WIN32_WINNT", "0x0A00"),
]
)
env.AppendUnique(CPPDEFINES=["NOMINMAX"]) # disable bogus min/max WinDef.h macros
@@ -753,8 +753,8 @@ def configure_mingw(env: "SConsEnvironment"):
env.Append(CPPDEFINES=["WINDOWS_ENABLED", "WASAPI_ENABLED", "WINMIDI_ENABLED"])
env.Append(
CPPDEFINES=[
"WINVER=0x0A00",
"_WIN32_WINNT=0x0A00",
("WINVER", "0x0A00"),
("_WIN32_WINNT", "0x0A00"),
]
)
env.Append(