inc_util = include_directories('.')
+subdir('format')
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',
'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',
'os_file.c',
'os_misc.c',
'os_misc.h',
+ 'os_socket.c',
+ 'os_socket.h',
'u_process.c',
'u_process.h',
'sha1/sha1.c',
'simple_mtx.h',
'slab.c',
'slab.h',
+ 'softfloat.c',
+ 'softfloat.h',
+ 'sparse_array.c',
+ 'sparse_array.h',
'string_buffer.c',
'string_buffer.h',
'strndup.h',
'u_vector.h',
'u_math.c',
'u_math.h',
+ 'u_mm.c',
+ 'u_mm.h',
'u_debug.c',
'u_debug.h',
'u_cpu_detect.c',
'u_cpu_detect.h',
'vma.c',
'vma.h',
+ 'xxhash.h',
)
files_drirc = files('00-mesa-defaults.conf')
capture : true,
)
+deps_for_libmesa_util = [
+ dep_zlib,
+ dep_clock,
+ dep_thread,
+ dep_atomic,
+ dep_m,
+ dep_valgrind,
+ dep_zstd,
+]
+
+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,
+ link_with: libmesa_format,
c_args : [c_msvc_compat_args, c_vis_args],
build_by_default : false
)
)
idep_xmlconfig = declare_dependency(
- sources : xmlpool_options_h,
- include_directories : inc_util,
+ dependencies : [idep_xmlconfig_headers, dep_expat],
link_with : _libxmlconfig,
- dependencies : dep_expat,
)
if with_tests
)
test(
- 'roundeven',
+ 'blob',
executable(
- 'roundeven_test',
- files('roundeven_test.c'),
+ 'blob_test',
+ files('blob_test.c'),
include_directories : inc_common,
+ dependencies : idep_mesautil,
c_args : [c_msvc_compat_args],
- dependencies : [dep_m],
),
suite : ['util'],
)
test(
- 'mesa-sha1',
+ 'rb_tree',
executable(
- 'mesa-sha1_test',
- files('mesa-sha1_test.c'),
+ '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(
+ 'roundeven_test',
+ files('roundeven_test.c'),
+ include_directories : inc_common,
+ c_args : [c_msvc_compat_args],
+ dependencies : [dep_m],
+ ),
+ suite : ['util'],
+ )
+
+ # FIXME: this test crashes on windows
+ if host_machine.system() != 'windows'
+ test(
+ 'mesa-sha1',
+ executable(
+ 'mesa-sha1_test',
+ files('mesa-sha1_test.c'),
+ include_directories : inc_common,
+ link_with : _libmesa_util,
+ c_args : [c_msvc_compat_args],
+ ),
+ suite : ['util'],
+ )
+ endif
+
test(
'bitset',
executable(
subdir('tests/fast_idiv_by_const')
subdir('tests/fast_urem_by_const')
subdir('tests/hash_table')
- subdir('tests/string_buffer')
- subdir('tests/timespec')
+ if not (host_machine.system() == 'windows' and cc.get_id() == 'gcc')
+ # FIXME: These tests fail with mingw, but not with msvc.
+ subdir('tests/string_buffer')
+ endif
+ if cc.has_header('sys/time.h') # MinGW has this, but Vanilla windows doesn't
+ subdir('tests/timespec')
+ endif
subdir('tests/vma')
subdir('tests/set')
+ subdir('tests/sparse_array')
+ subdir('tests/format')
+ subdir('tests/vector')
endif