anv/android: we need git_sha1.h in include paths

[mesa.git] / src / intel / isl / meson.build

diff --git a/src/intel/isl/meson.build b/src/intel/isl/meson.build
index 116750d86d6659298a7fbf0d6f5c034567356c2a..62cde190e6e8a0b963843f79d0088c800843ad73 100644 (file)
--- a/src/intel/isl/meson.build
+++ b/src/intel/isl/meson.build
@@ -51,24 +51,22 @@ isl_gen9_files = files(
 isl_gen_libs = []
 foreach g : [['40', isl_gen4_files], ['50', []], ['60', isl_gen6_files],
              ['70', isl_gen7_files], ['75', []], ['80', isl_gen8_files],
-             ['90', isl_gen9_files], ['100', []]]
+             ['90', isl_gen9_files], ['100', []], ['110', []]]
   _gen = g[0]
-  _sources = g[1]
-  _lib = static_library(
-    'libisl_gen@0@'.format(_gen),
-    [_sources, isl_gen_files, gen_xml_pack],
+  isl_gen_libs += static_library(
+    '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,
               '-DGEN_VERSIONx10=@0@'.format(_gen)],
   )
-  isl_gen_libs += _lib
 endforeach
 
 isl_format_layout_c = custom_target(
   'isl_format_layout.c',
   input : ['gen_format_layout.py', 'isl_format_layout.csv'],
   output : 'isl_format_layout.c',
-  command : [prog_python2, '@INPUT0@', '--csv', '@INPUT1@', '--out', '@OUTPUT@'],
+  command : [prog_python, '@INPUT0@', '--csv', '@INPUT1@', '--out', '@OUTPUT@'],
 )
 
 libisl_files = files(
@@ -97,7 +95,7 @@ if with_tests
       'tests/isl_surf_get_image_offset_test.c',
       dependencies : dep_m,
       include_directories : [inc_common, inc_intel],
-      link_with : [libisl, libintel_common],
+      link_with : [libisl, libintel_dev, libmesa_util],
     )
   )
 endif