diff options
| author | Eric Engestrom <eric.engestrom@intel.com> | 2018-06-15 11:31:52 +0100 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2018-06-18 13:30:18 -0700 |
| commit | 7540acb1372804357f3901a1dd6997805b14a41a (patch) | |
| tree | 9fc911d10747199a74aae7c5a4e1e87f6ac9d7db | |
| parent | 6bc8fcbc94daab49ac5e3735951263026b3140c9 (diff) | |
meson: fix i965/anv/isl genX static lib names
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 <eric.engestrom@intel.com>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
(cherry picked from commit e8eb84826e30ffcb54f69a7aec9181f969418eb2)
Trivial merge conflicts resolved by Dylan.
| -rw-r--r-- | src/intel/isl/meson.build | 2 | ||||
| -rw-r--r-- | src/intel/vulkan/meson.build | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/meson.build | 2 |
3 files changed, 3 insertions, 3 deletions
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, diff --git a/src/mesa/drivers/dri/i965/meson.build b/src/mesa/drivers/dri/i965/meson.build index 4d8280df57..747fd32b66 100644 --- a/src/mesa/drivers/dri/i965/meson.build +++ b/src/mesa/drivers/dri/i965/meson.build @@ -138,7 +138,7 @@ files_i965 = files( i965_gen_libs = [] foreach v : ['40', '45', '50', '60', '70', '75', '80', '90', '100', '110'] i965_gen_libs += static_library( - 'libi965_gen@0@'.format(v), + 'i965_gen@0@'.format(v), ['genX_blorp_exec.c', 'genX_state_upload.c', gen_xml_pack], include_directories : [inc_common, inc_intel, inc_dri_common], c_args : [ |