From 84b64458e5031b8990a20ed56c1e82d2915a4b55 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Wed, 18 Apr 2018 13:23:48 -0700 Subject: meson: Add necessary defines for mesa_gallium on windows --- 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 cba361c098..c1606b4551 100644 --- a/src/mesa/meson.build +++ b/src/mesa/meson.build @@ -716,11 +716,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, include_directories('main')], link_with : [libglsl, libmesa_sse41], dependencies : [idep_nir_headers, dep_vdpau], -- cgit v1.2.3