'half_float.h',
'hash_table.c',
'hash_table.h',
- 'imports.c',
- 'imports.h',
'list.h',
'macros.h',
'mesa-sha1.c',
'u_vector.h',
'u_math.c',
'u_math.h',
+ 'u_memset.h',
'u_mm.c',
'u_mm.h',
'u_debug.c',
_libmesa_util = static_library(
'mesa_util',
[files_mesa_util, format_srgb],
- include_directories : inc_common,
+ include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
dependencies : deps_for_libmesa_util,
link_with: libmesa_format,
c_args : [c_msvc_compat_args, c_vis_args],
_libxmlconfig = static_library(
'xmlconfig',
files_xmlconfig,
- include_directories : inc_common,
+ include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
dependencies : [idep_mesautil, dep_expat, dep_m],
c_args : [
c_msvc_compat_args, c_vis_args,
executable(
'u_atomic_test',
files('u_atomic_test.c'),
- include_directories : inc_common,
+ include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
dependencies : idep_mesautil,
c_args : [c_msvc_compat_args],
),
executable(
'blob_test',
files('blob_test.c'),
- include_directories : inc_common,
+ include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
dependencies : idep_mesautil,
c_args : [c_msvc_compat_args],
),
executable(
'rb_tree_test',
files('rb_tree_test.c'),
- include_directories : inc_common,
+ include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
dependencies : idep_mesautil,
c_args : [c_msvc_compat_args],
),
executable(
'roundeven_test',
files('roundeven_test.c'),
- include_directories : inc_common,
+ include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
c_args : [c_msvc_compat_args],
dependencies : [dep_m],
),
executable(
'mesa-sha1_test',
files('mesa-sha1_test.c'),
- include_directories : inc_common,
+ include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
link_with : _libmesa_util,
c_args : [c_msvc_compat_args],
),
executable(
'bitset_test',
files('bitset_test.cpp'),
- include_directories : inc_common,
+ include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
dependencies : [idep_mesautil, idep_gtest],
),
suite : ['util'],
process_test_exe = executable(
'process_test',
files('process_test.c'),
- include_directories : inc_common,
+ include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
dependencies : idep_mesautil,
c_args : [c_msvc_compat_args],
)
- if (host_machine.system() == 'windows' and cc.get_id() == 'gcc')
- # This conversion is only required on mingw
+ if (host_machine.system() == 'windows' and build_machine.system() != 'windows')
+ # This conversion is only required on mingw crosscompilers, otherwise we hit at least one of these issues
+ # https://gitlab.freedesktop.org/mesa/mesa/-/issues/2690
+ # https://gitlab.freedesktop.org/mesa/mesa/-/issues/2788
+ prog_winepath = find_program('winepath')
process_test_exe_full_path = run_command(
- 'winepath', '-w', process_test_exe.full_path()
+ prog_winepath, '-w', process_test_exe.full_path()
).stdout().strip()
else
process_test_exe_full_path = process_test_exe.full_path()
endif
subdir('tests/vma')
subdir('tests/set')
- # FIXME: this test on the Wine version in GitLab CI
- if host_machine.system() != 'windows'
- subdir('tests/sparse_array')
- endif
+ subdir('tests/sparse_array')
subdir('tests/format')
subdir('tests/vector')
endif