# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
+inc_util_c11 = [include_directories('../..')]
+
files_mesa_util_c11 = files(
'time.c',
)
_libmesa_util_c11 = static_library(
'mesa_util_c11',
[files_mesa_util_c11],
- include_directories : [inc_include, inc_src],
+ include_directories : inc_util_c11,
c_args : [c_msvc_compat_args],
gnu_symbol_visibility : 'hidden',
build_by_default : false
idep_mesautilc11 = declare_dependency(
link_with : _libmesa_util_c11,
- include_directories : [inc_include, inc_src],
+ include_directories : inc_util_c11,
dependencies : [dep_clock, dep_thread, dep_atomic, dep_m, dep_valgrind],
)
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
-files_mesa_format = [
+files_mesa_format = files(
'u_format.c',
'u_format_bptc.c',
'u_format_etc.c',
'u_format_unpack_neon.c',
'u_format_yuv.c',
'u_format_zs.c',
-]
+)
# TODO: remove the quirk when GCC get test and fix inside release
# See: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=108163
capture : true,
)
-libmesa_format = static_library(
- 'mesa_format',
- [files_mesa_format, u_format_table_c, u_format_pack_h],
- include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
- # NOTE dep_valgrind used here instead of idep_mesautil due to chicken/egg
- # dependencies between util and util/format
- dependencies : [dep_m, dep_valgrind],
- c_args : [c_msvc_compat_args, arm_neon_workaround],
- gnu_symbol_visibility : 'hidden',
- build_by_default : false
-)
+files_mesa_format += [u_format_pack_h, u_format_table_c]
inc_util = [inc_include, include_directories('..')]
subdir('blake3')
-subdir('format')
files_mesa_util = files(
'anon_file.h',
'strndup.h',
'strtod.c',
'strtod.h',
- 'texcompress_rgtc_tmp.h',
'timespec.h',
'u_atomic.c',
'u_atomic.h',
'mesa_util_sse41',
files('streaming-load-memcpy.c'),
c_args : [c_msvc_compat_args, sse41_args],
- include_directories : [inc_include, inc_src, inc_mesa],
+ include_directories : [inc_util],
gnu_symbol_visibility : 'hidden',
)
+# subdir format provide files_mesa_format
+subdir('format')
+files_mesa_util += files_mesa_format
+
_libmesa_util = static_library(
'mesa_util',
[files_mesa_util, files_debug_stack, format_srgb],
- include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
+ include_directories : [inc_util, include_directories('format')],
dependencies : deps_for_libmesa_util,
- link_with: [libmesa_format, libmesa_util_sse41],
+ link_with: [libmesa_util_sse41],
c_args : [c_msvc_compat_args],
gnu_symbol_visibility : 'hidden',
build_by_default : false
idep_mesautil = declare_dependency(
link_with : _libmesa_util,
- include_directories : [inc_util, inc_gallium],
+ include_directories : [inc_util],
dependencies : deps_for_libmesa_util,
)
_libxmlconfig = static_library(
'xmlconfig',
files_xmlconfig,
- include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
dependencies : [idep_mesautil, dep_m, xmlconfig_deps],
c_args : [
c_msvc_compat_args,
test('xmlconfig',
executable('xmlconfig_test',
files('tests/xmlconfig.cpp'),
- include_directories : [inc_include, inc_src],
dependencies : [idep_mesautil, idep_xmlconfig, idep_gtest],
override_options : ['cpp_std=c++2a'],
cpp_args: ['-Wno-write-strings', c_xmlconfig_arg]
executable(
'util_tests',
files_util_tests,
- 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('tests/process_test.c'),
- include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
dependencies : idep_mesautil,
c_args : [c_msvc_compat_args],
)