mesa/main/util: moving gallium u_mm to util, remove main/mm

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

diff --git a/src/mesa/meson.build b/src/mesa/meson.build
index 563bdd7c10375aa46b8813cd1670dfd077cf797d..1254ccc619ea2449e21914545d1f9b64f091b823 100644 (file)
--- a/src/mesa/meson.build
+++ b/src/mesa/meson.build
@@ -189,8 +189,6 @@ files_libmesa_common = files(
   'main/matrix.h',
   'main/mipmap.c',
   'main/mipmap.h',
-  'main/mm.c',
-  'main/mm.h',
   'main/menums.h',
   'main/mtypes.h',
   'main/multisample.c',
@@ -697,6 +695,10 @@ files_libmesa_common += [
   main_remap_helper_h,
   sha1_h,
 ]
+files_libmesa_gallium += [
+  ir_expression_operation_h,
+  sha1_h,
+]
 
 if with_sse41
   libmesa_sse41 = static_library(
@@ -709,24 +711,46 @@ else
   libmesa_sse41 = []
 endif
 
+_mesa_windows_args = []
+if with_platform_windows
+  _mesa_windows_args += [
+    '-D_GDI32_',    # prevent gl* being declared __declspec(dllimport) in MS headers
+    '-DBUILD_GL32'  # declare gl* as __declspec(dllexport) in Mesa headers
+  ]
+  if not with_shared_glapi
+    # prevent _glapi_* from being declared __declspec(dllimport)
+    _mesa_windows_args += '-D_GLAPI_NO_EXPORTS'
+  endif
+endif
+
+libmesa_common = static_library(
+  'mesa_common',
+  files_libmesa_common,
+  c_args : [c_vis_args, c_msvc_compat_args, _mesa_windows_args],
+  cpp_args : [cpp_vis_args, cpp_msvc_compat_args, _mesa_windows_args],
+  include_directories : [inc_common, inc_libmesa_asm, include_directories('main')],
+  dependencies : idep_nir_headers,
+  build_by_default : false,
+)
+
 libmesa_classic = static_library(
   'mesa_classic',
-  [files_libmesa_common, files_libmesa_classic],
+  files_libmesa_classic,
   c_args : [c_vis_args, c_msvc_compat_args],
   cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
   include_directories : [inc_common, inc_libmesa_asm, include_directories('main')],
-  link_with : [libglsl, libmesa_sse41],
+  link_with : [libmesa_common, libglsl, libmesa_sse41],
   dependencies : idep_nir_headers,
   build_by_default : false,
 )
 
 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],
+  files_libmesa_gallium,
+  c_args : [c_vis_args, c_msvc_compat_args, _mesa_windows_args],
+  cpp_args : [cpp_vis_args, cpp_msvc_compat_args, _mesa_windows_args],
   include_directories : [inc_common, inc_libmesa_asm, include_directories('main')],
-  link_with : [libglsl, libmesa_sse41],
+  link_with : [libmesa_common, libglsl, libmesa_sse41],
   dependencies : [idep_nir_headers, dep_vdpau],
   build_by_default : false,
 )