Mesa (master): wgl: Switch to Win10 version defines to enable usage of Win10 WGL callbacks
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Fri Aug 21 10:07:50 UTC 2020
Module: Mesa
Branch: master
Commit: 258ef4d4a4b6c11b141e12e6736b01f408461c1d
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=258ef4d4a4b6c11b141e12e6736b01f408461c1d
Author: Jesse Natalie <jenatali at ntdev.microsoft.com>
Date: Tue Mar 17 10:53:33 2020 -0700
wgl: Switch to Win10 version defines to enable usage of Win10 WGL callbacks
Reviewed-by: Erik Faye-Lund <erik.faye-lund at collabora.com>
Reviewed-by: Jose Fonseca <jfonseca at vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6228>
---
meson.build | 2 +-
scons/gallium.py | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meson.build b/meson.build
index 9bf889659a3..dba847b9f85 100644
--- a/meson.build
+++ b/meson.build
@@ -932,7 +932,7 @@ elif host_machine.system() == 'sunos'
pre_args += '-D__EXTENSIONS__'
elif host_machine.system() == 'windows'
pre_args += [
- '-D_WINDOWS', '-D_WIN32_WINNT=0x0601', '-DWINVER=0x0601',
+ '-D_WINDOWS', '-D_WIN32_WINNT=0x0A00', '-DWINVER=0x0A00',
'-DPIPE_SUBSYSTEM_WINDOWS_USER',
'-D_USE_MATH_DEFINES', # XXX: scons doesn't use this for mingw
]
diff --git a/scons/gallium.py b/scons/gallium.py
index ea212d15a95..40903cd0cc9 100755
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -399,8 +399,8 @@ def generate(env):
#'_UNICODE',
#'UNICODE',
# http://msdn.microsoft.com/en-us/library/aa383745.aspx
- ('_WIN32_WINNT', '0x0601'),
- ('WINVER', '0x0601'),
+ ('_WIN32_WINNT', '0x0A00'),
+ ('WINVER', '0x0A00'),
]
if gcc_compat:
cppdefines += [('__MSVCRT_VERSION__', '0x0700')]
More information about the mesa-commit
mailing list