From: Erik Faye-Lund <erik.faye-lund@collabora.com>
Date: Wed, 22 Apr 2020 15:54:38 +0000 (+0200)
Subject: meson: correct windows-version define
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7f17a0a809195cefa2240f55d30f00e3fe0572b3;p=mesa.git

meson: correct windows-version define

The macro "_WINVER" does nothing, the macro definitions that matter for
windows API version selection are "_WIN32_WINNT" and "WINVER".

The header "sdkddkver.h" (which is included from thousands of
different windows-headers) defines "WINVER" to the same value as
"_WIN32_WINNT" of only the latter is defined, which explains why this
works right now. But we shouldn't depend on that kind of luck, and
instead define the right maco.

Fixes: 3aee462781a ("meson: add windows compiler checks and libraries")
Acked-by: Dylan Baker <dylan@pnwbakers.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4681>
---

diff --git a/meson.build b/meson.build
index 0bd8e3bd8ff..d3557d318d7 100644
--- a/meson.build
+++ b/meson.build
@@ -899,7 +899,7 @@ elif host_machine.system() == 'sunos'
   pre_args += '-D__EXTENSIONS__'
 elif host_machine.system() == 'windows'
   pre_args += [
-    '-D_WINDOWS', '-D_WIN32_WINNT=0x0601', '-D_WINVER=0x0601',
+    '-D_WINDOWS', '-D_WIN32_WINNT=0x0601', '-DWINVER=0x0601',
     '-DPIPE_SUBSYSTEM_WINDOWS_USER',
     '-D_USE_MATH_DEFINES',  # XXX: scons doesn't use this for mingw
   ]