diff options
| author | Fabio Alessandrelli | 2016-11-03 05:20:26 +0100 |
|---|---|---|
| committer | Rémi Verschelde | 2017-01-12 19:15:30 +0100 |
| commit | 9c8ecb45f8516a2d45c18c50093887448d8a64e8 (patch) | |
| tree | fc173196b88a960343ee2c1109b3fedbaaebc22a /platform | |
| parent | 8a5596322d586007d66c90b25ef2dd09d196fdfa (diff) | |
| download | godot-9c8ecb45f8516a2d45c18c50093887448d8a64e8.tar.gz godot-9c8ecb45f8516a2d45c18c50093887448d8a64e8.tar.zst godot-9c8ecb45f8516a2d45c18c50093887448d8a64e8.zip | |
Improvements to scons defined WINVER/_WIN32_WINNT
(cherry picked from commit 65483d57bf322f847ecb1ab906e8f4fac49f2557)
Diffstat (limited to '')
| -rw-r--r-- | platform/windows/detect.py | 4 | ||||
| -rw-r--r-- | platform/winrt/detect.py | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/platform/windows/detect.py b/platform/windows/detect.py index 590f92a05..6972d1e9c 100644 --- a/platform/windows/detect.py +++ b/platform/windows/detect.py @@ -200,7 +200,7 @@ def configure(env): env.Append(CPPPATH=['#platform/windows']) # Targeted Windows version: Vista (and later) - env.Append(CPPFLAGS=['-D_WIN32_WINNT=0x0600']) + winver = "0x0600" # Windows Vista is the minimum target for windows builds env['is_mingw'] = False if (os.name == "nt" and os.getenv("VSINSTALLDIR") != None): @@ -208,6 +208,7 @@ def configure(env): env['ENV']['TMP'] = os.environ['TMP'] env.Append(CPPPATH=['#platform/windows/include']) env.Append(LIBPATH=['#platform/windows/lib']) + env.Append(CCFLAGS=['/DWINVER=%s' % winver, '/D_WIN32_WINNT=%s' % winver]) if (env["target"] == "release"): @@ -298,6 +299,7 @@ def configure(env): env.use_windows_spawn_fix() # build using mingw + env.Append(CCFLAGS=['-DWINVER=%s' % winver, '-D_WIN32_WINNT=%s' % winver]) if (os.name == "nt"): env['ENV']['TMP'] = os.environ['TMP'] # way to go scons, you can be so stupid sometimes else: diff --git a/platform/winrt/detect.py b/platform/winrt/detect.py index 5002495c5..d063be465 100644 --- a/platform/winrt/detect.py +++ b/platform/winrt/detect.py @@ -136,8 +136,12 @@ def configure(env): env.Append(CCFLAGS=['/DGLES2_ENABLED']) # env.Append(CCFLAGS=['/DGLES1_ENABLED']) + winver = "0x0602" # Windows 8 is the minimum target for UWP build + env.Append(CCFLAGS=['/DWINVER=%s' % winver, '/D_WIN32_WINNT=%s' % winver]) + LIBS = [ #'winmm', + 'ws2_32', 'libEGL', 'libGLESv2', 'libANGLE', |