From 7540acb1372804357f3901a1dd6997805b14a41a Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Fri, 15 Jun 2018 11:31:52 +0100 Subject: meson: fix i965/anv/isl genX static lib names MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Shouldn't make any functional difference, just that `liblibanv_gen90.a` will now be called `libanv_gen90.a`. Fixes: 3218056e0eb375eeda470 "meson: Build i965 and dri stack" Fixes: d1992255bb29054fa5176 "meson: Add build Intel "anv" vulkan driver" Signed-off-by: Eric Engestrom Reviewed-by: Tapani Pälli Reviewed-by: Dylan Baker (cherry picked from commit e8eb84826e30ffcb54f69a7aec9181f969418eb2) Trivial merge conflicts resolved by Dylan. --- src/intel/isl/meson.build | 2 +- src/intel/vulkan/meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/intel') diff --git a/src/intel/isl/meson.build b/src/intel/isl/meson.build index 73a8837f2a..b4d707f3ff 100644 --- a/src/intel/isl/meson.build +++ b/src/intel/isl/meson.build @@ -54,7 +54,7 @@ foreach g : [['40', isl_gen4_files], ['50', []], ['60', isl_gen6_files], ['90', isl_gen9_files], ['100', []], ['110', []]] _gen = g[0] isl_gen_libs += static_library( - 'libisl_gen@0@'.format(_gen), + 'isl_gen@0@'.format(_gen), [g[1], isl_gen_files, gen_xml_pack], include_directories : [inc_common, inc_intel], c_args : [c_vis_args, no_override_init_args, diff --git a/src/intel/vulkan/meson.build b/src/intel/vulkan/meson.build index 2dce0a1515..0e9efe1dd9 100644 --- a/src/intel/vulkan/meson.build +++ b/src/intel/vulkan/meson.build @@ -104,7 +104,7 @@ foreach g : [['70', ['gen7_cmd_buffer.c']], ['75', ['gen7_cmd_buffer.c']], ['100', ['gen8_cmd_buffer.c']], ['110', ['gen8_cmd_buffer.c']]] _gen = g[0] libanv_gen_libs += static_library( - 'libanv_gen@0@'.format(_gen), + 'anv_gen@0@'.format(_gen), [anv_gen_files, g[1], block_entrypoints], include_directories : [ inc_common, inc_compiler, inc_drm_uapi, inc_intel, inc_vulkan_util, -- cgit v1.2.3