From aa2bd16dec303ae36863bbac0c057355371ed8f9 Mon Sep 17 00:00:00 2001 From: Caio Oliveira Date: Wed, 15 Jan 2025 22:28:57 -0800 Subject: [PATCH] intel/tools: Use idep_libintel_common in meson Since the internal dependency object exists and is already used in some cases, let's be consistent. Reviewed-by: Daniel Stone Reviewed-by: Lionel Landwerlin Acked-by: Kenneth Graunke Part-of: --- src/intel/tools/meson.build | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/intel/tools/meson.build b/src/intel/tools/meson.build index d06f68bcaea..f9daa52264d 100644 --- a/src/intel/tools/meson.build +++ b/src/intel/tools/meson.build @@ -5,8 +5,7 @@ libaub = static_library( 'aub', files('aub_read.c', 'aub_mem.c'), include_directories : [inc_include, inc_src, inc_intel], - dependencies : [idep_mesautil, idep_intel_dev, idep_intel_decoder_brw, idep_intel_decoder_elk], - link_with : [libintel_common], + dependencies : [idep_mesautil, idep_intel_dev, idep_intel_decoder_brw, idep_intel_decoder_elk, idep_libintel_common], c_args : [no_override_init_args], gnu_symbol_visibility : 'hidden', install : false @@ -16,10 +15,11 @@ aubinator = executable( 'aubinator', files('aubinator.c'), dependencies : [idep_mesautil, dep_expat, dep_zlib, dep_dl, dep_thread, dep_m, idep_intel_dev, + idep_libintel_common, idep_intel_decoder_brw, idep_intel_decoder_elk, idep_intel_compiler_brw, idep_intel_compiler_elk], include_directories : [inc_include, inc_src, inc_intel], - link_with : [libintel_common, libaub], + link_with : [libaub], c_args : [no_override_init_args], gnu_symbol_visibility : 'hidden', install : true @@ -37,10 +37,10 @@ aubinator_error_decode = executable( 'error_decode_xe_lib.c', 'error_decode_xe_lib.h'), dependencies : [idep_mesautil, dep_zlib, dep_thread, idep_intel_dev, + idep_libintel_common, idep_intel_decoder_brw, idep_intel_decoder_elk, idep_intel_compiler_brw, idep_intel_compiler_elk], include_directories : [inc_include, inc_src, inc_intel], - link_with : [libintel_common], c_args : [no_override_init_args], gnu_symbol_visibility : 'hidden', install : true @@ -109,9 +109,9 @@ configure_file( libintel_sanitize_gpu = shared_library( 'intel_sanitize_gpu', files('intel_sanitize_gpu.c'), - dependencies : [idep_mesautil, dep_dl, dep_thread, idep_intel_dev], + dependencies : [idep_mesautil, dep_dl, dep_thread, idep_intel_dev, + idep_libintel_common], include_directories : [inc_include, inc_src, inc_intel], - link_with : libintel_common, c_args : [no_override_init_args, sse2_args], gnu_symbol_visibility : 'hidden', install_dir : get_option('libexecdir'), @@ -132,9 +132,8 @@ libintel_dump_gpu = shared_library( 'intel_context.h', 'gfx8_context.h', 'gfx10_context.h', 'intel_aub.h', 'aub_write.h', 'aub_write.c', 'intel_dump_gpu.c', ), - dependencies : [dep_dl, idep_mesautil, idep_intel_dev], + dependencies : [dep_dl, idep_mesautil, idep_intel_dev, idep_libintel_common], include_directories : [inc_include, inc_src, inc_intel], - link_with : [libintel_common], c_args : [no_override_init_args], gnu_symbol_visibility : 'hidden', install_dir : get_option('libexecdir'), @@ -167,9 +166,10 @@ if with_tools.contains('intel-ui') 'aubinator_viewer', files('aubinator_viewer.cpp', 'aubinator_viewer_decoder.cpp'), dependencies : [idep_mesautil, dep_zlib, dep_dl, dep_thread, dep_m, libintel_imgui_gtk_dep, idep_intel_dev, + idep_libintel_common, idep_intel_compiler_brw, idep_intel_compiler_elk], include_directories : [inc_include, inc_src, inc_intel], - link_with : [libintel_common, libaub], + link_with : [libaub], c_args : [no_override_init_args], gnu_symbol_visibility : 'hidden', cpp_args : ['-fpermissive', '-Wno-parentheses'],