X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Futil%2Fmeson.build;h=5603020376335c113b33f182202cb1235768832f;hb=d35d7346d2446d8638b90425607c3f25fc339008;hp=d3c186366fb3a811f99cc432a5220e291627dc67;hpb=d2d85b950d78c553b2694cda9ef0cc7bf9a0f737;p=mesa.git

diff --git a/src/util/meson.build b/src/util/meson.build
index d3c186366fb..56030203763 100644
--- a/src/util/meson.build
+++ b/src/util/meson.build
@@ -23,10 +23,14 @@ inc_util = include_directories('.')
 subdir('xmlpool')
 
 files_mesa_util = files(
+  'anon_file.h',
+  'anon_file.c',
   'bigmath.h',
   'bitscan.c',
   'bitscan.h',
   'bitset.h',
+  'blob.c',
+  'blob.h',
   'build_id.c',
   'build_id.h',
   'crc32.c',
@@ -36,6 +40,8 @@ files_mesa_util = files(
   'debug.h',
   'disk_cache.c',
   'disk_cache.h',
+  'double.c',
+  'double.h',
   'fast_idiv_by_const.c',
   'fast_idiv_by_const.h',
   'format_r11g11b10f.h',
@@ -76,6 +82,8 @@ files_mesa_util = files(
   'simple_mtx.h',
   'slab.c',
   'slab.h',
+  'softfloat.c',
+  'softfloat.h',
   'string_buffer.c',
   'string_buffer.h',
   'strndup.h',
@@ -132,11 +140,24 @@ format_srgb = custom_target(
   capture : true,
 )
 
+deps_for_libmesa_util = [
+  dep_zlib,
+  dep_clock,
+  dep_thread,
+  dep_atomic,
+  dep_m,
+  dep_valgrind,
+]
+
+if with_platform_android
+  deps_for_libmesa_util += dep_android
+endif
+
 _libmesa_util = static_library(
   'mesa_util',
   [files_mesa_util, format_srgb],
   include_directories : inc_common,
-  dependencies : [dep_zlib, dep_clock, dep_thread, dep_atomic, dep_m],
+  dependencies : deps_for_libmesa_util,
   c_args : [c_msvc_compat_args, c_vis_args],
   build_by_default : false
 )
@@ -147,7 +168,7 @@ idep_mesautil = declare_dependency(
   dependencies : [dep_zlib, dep_clock, dep_thread, dep_atomic, dep_m],
 )
 
-libxmlconfig = static_library(
+_libxmlconfig = static_library(
   'xmlconfig',
   files_xmlconfig,
   include_directories : inc_common,
@@ -167,7 +188,7 @@ libxmlconfig = static_library(
 idep_xmlconfig = declare_dependency(
   sources : xmlpool_options_h,
   include_directories : inc_util,
-  link_with : libxmlconfig,
+  link_with : _libxmlconfig,
   dependencies : dep_expat,
 )
 
@@ -184,6 +205,30 @@ if with_tests
     suite : ['util'],
   )
 
+  test(
+    'blob',
+    executable(
+      'blob_test',
+      files('blob_test.c'),
+      include_directories : inc_common,
+      dependencies : idep_mesautil,
+      c_args : [c_msvc_compat_args],
+    ),
+    suite : ['util'],
+  )
+
+  test(
+    'rb_tree',
+    executable(
+      'rb_tree_test',
+      files('rb_tree_test.c'),
+      include_directories : inc_common,
+      dependencies : idep_mesautil,
+      c_args : [c_msvc_compat_args],
+    ),
+    suite : ['util'],
+  )
+
   test(
     'roundeven',
     executable(
@@ -214,7 +259,7 @@ if with_tests
        'bitset_test',
        files('bitset_test.cpp'),
        include_directories : inc_common,
-       dependencies : [idep_mesautil, dep_thread, dep_dl, idep_gtest],
+       dependencies : [idep_mesautil, idep_gtest],
      ),
      suite : ['util'],
   )