spirv: Add support for IntegerFunctions2INTEL capability

[mesa.git] / src / mapi / glapi / meson.build

diff --git a/src/mapi/glapi/meson.build b/src/mapi/glapi/meson.build
index 6a4f9f5733e13821abb913561758206d390a0da6..1b8b685f207eee43feef8483cd2cba2ae9fe8a4e 100644 (file)
--- a/src/mapi/glapi/meson.build
+++ b/src/mapi/glapi/meson.build
@@ -25,7 +25,7 @@ inc_glapi = include_directories('.')
 static_glapi_files = []
 static_glapi_args = []
 
-if ['apple', 'windows'].contains(with_dri_platform)
+if with_dri and ['apple', 'windows'].contains(with_dri_platform)
   static_glapi_files += [glapi_gentable_c, glapitable_h]
 endif
 
@@ -46,8 +46,19 @@ if with_shared_glapi
     '-DMAPI_ABI_HEADER="@0@"'.format(glapi_mapi_tmp_h.full_path()),
     gcc_lto_quirk,
   ]
+  if with_platform_windows
+    static_glapi_args += ['-D_GDI32_', '-DBUILD_GL32']
+  endif
 else
   static_glapi_args += '-DMAPI_MODE_UTIL'
+  if with_platform_windows
+    static_glapi_args += ['-D_GDI32_', '-DBUILD_GL32', '-DKHRONOS_DLL_EXPORTS']
+    if with_shared_glapi
+      static_glapi_args += '-D_GLAPI_DLL_EXPORTS'
+    else
+      static_glapi_args += '-D_GLAPI_NO_EXPORTS'
+    endif
+  endif
   static_glapi_files += files(
     'glapi_dispatch.c',
     'glapi_entrypoint.c',
@@ -79,7 +90,9 @@ libglapi_static = static_library(
   build_by_default : false,
 )
 
-if with_any_opengl and not with_shared_glapi and with_tests
+# TODO: this test doesn't compile on windows with mingw or msvc due to
+# undefined symbols from libglapi_static, but that should be fixable.
+if with_any_opengl and not with_shared_glapi and with_tests and not with_platform_windows
   test(
     'glapi_static_check_table',
     executable(