Module: Mesa
Branch: master
Commit: e8eb84826e30ffcb54f69a7aec9181f969418eb2
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=e8eb84826e30ffcb54f69a7aec9181f969418eb2
Author: Eric Engestrom <eric.engest...@intel.com>
Date: Fri Jun 15 11:31:52 2018 +0100
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.engest...@intel.com>
Reviewed-by: Tapani Pälli <tapani.pa...@intel.com>
Reviewed-by: Dylan Baker <dy...@pnwbakers.com>
---
src/intel/isl/meson.build | 2 +-
src/intel/vulkan/meson.build | 2 +-
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 c70c5c05fc..5b57188d30 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 f20a8a54c9..159ad09231 100644
--- a/src/intel/vulkan/meson.build
+++ b/src/intel/vulkan/meson.build
@@ -95,7 +95,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], anv_entrypoints[0], anv_extensions_h],
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 20404d5b05..761bb51d6f 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 : [
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
