[Mesa-dev] [PATCH 33/48] meson: don't define GLX_USE_TLS for windows

[Dylan Baker]

Because the macros for exporting dll symbols and using TLS are mutually
exclusive.
---
 meson.build | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index bbcfb8ed8cb..a244694fd4a 100644
--- a/meson.build
+++ b/meson.build
@@ -327,7 +327,10 @@ if with_egl and not (with_platform_drm or with_platform_surfaceless)
   endif
 endif
 
-pre_args += '-DGLX_USE_TLS'
+if host_machine.system() != 'windows'
+  # On windows Thread local storage and dll export are mutually exclusive
+  pre_args += '-DGLX_USE_TLS'
+endif
 if with_glx != 'disabled'
   if not (with_platform_x11 and with_any_opengl)
     error('Cannot build GLX support without X11 platform support and at least one OpenGL API')
-- 
2.17.1