[Mesa-dev] [PATCH v2 17/49] meson: Add necessary defines for mesa_gallium on windows

Dylan Baker dylan at pnwbakers.com
Tue Jul 10 23:17:45 UTC 2018


---
 src/mesa/meson.build | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/mesa/meson.build b/src/mesa/meson.build
index 8fb7db215c8..37baff51cfd 100644
--- a/src/mesa/meson.build
+++ b/src/mesa/meson.build
@@ -726,11 +726,19 @@ libmesa_classic = static_library(
   build_by_default : false,
 )
 
+_mesa_gallium_args = []
+if with_platform_windows
+  _mesa_gallium_args += ['-D_GDI32_', '-DBUILD_GL32']
+  if not with_gles2
+    _mesa_gallium_args += '-D_GLAPI_NO_EXPORTS'
+  endif
+endif
+
 libmesa_gallium = static_library(
   'mesa_gallium',
   [files_libmesa_common, files_libmesa_gallium],
-  c_args : [c_vis_args, c_msvc_compat_args],
-  cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
+  c_args : [c_vis_args, c_msvc_compat_args, _mesa_gallium_args],
+  cpp_args : [cpp_vis_args, cpp_msvc_compat_args, _mesa_gallium_args],
   include_directories : [inc_common, inc_libmesa_asm, include_directories('main')],
   link_with : [libglsl, libmesa_sse41],
   dependencies : [idep_nir_headers, dep_vdpau],
-- 
2.18.0



More information about the mesa-dev mailing list