diff options
| author | Erik Faye-Lund <[email protected]> | 2020-04-22 17:54:38 +0200 |
|---|---|---|
| committer | Marge Bot <[email protected]> | 2020-04-23 11:19:52 +0000 |
| commit | 7f17a0a809195cefa2240f55d30f00e3fe0572b3 (patch) | |
| tree | 50bebb257fa66a3d7f6e655f95dc4d1cbc67babf | |
| parent | 32d871b48fbf38cb309eaaa13c8b425695141b60 (diff) | |
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 <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4681>
| -rw-r--r-- | meson.build | 2 |
1 files changed, 1 insertions, 1 deletions
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 ] |