Mesa (master): meson: fix formatting and add extra_files to i965

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 43b0d5fa04cec45ab61b654bfa25f6a1b1af027f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=43b0d5fa04cec45ab61b654bfa25f6a1b1af027f

Author: Dylan Baker <dylan at pnwbakers.com>
Date:   Tue Oct 23 10:40:15 2018 -0700

meson: fix formatting and add extra_files to i965

extra_files is just a nice way to to tell certain IDEs (and those
reading the file) that this file is also a dependency. Meson will use
the .d file generated by the compiler to figure out what the target
actually depends on.

Reviewed-by: Tapani Pälli <tapani.palli at intel.com>
Reviewed-by: Juan A. Suarez <jasuarez at igalia.com>

---

 src/mesa/drivers/dri/i965/meson.build | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/meson.build b/src/mesa/drivers/dri/i965/meson.build
index bf366a6c15..24172955e9 100644
--- a/src/mesa/drivers/dri/i965/meson.build
+++ b/src/mesa/drivers/dri/i965/meson.build
@@ -191,20 +191,22 @@ intel_tiled_memcpy = static_library(
     inc_common, inc_intel, inc_dri_common, inc_drm_uapi,
   ],
   c_args : [c_vis_args, no_override_init_args, '-msse2'],
+  extra_files : ['intel_tiled_memcpy.c']
 )
 
 if with_sse41
-intel_tiled_memcpy_sse41 = static_library(
-  'intel_tiled_memcpy_sse41',
-  [files_intel_tiled_memcpy_sse41],
-  include_directories : [
-    inc_common, inc_intel, inc_dri_common, inc_drm_uapi,
-  ],
-  link_args : [ '-Wl,--exclude-libs=ALL' ],
-  c_args : [c_vis_args, no_override_init_args, '-Wl,--exclude-libs=ALL', '-msse2', sse41_args],
-)
+  intel_tiled_memcpy_sse41 = static_library(
+    'intel_tiled_memcpy_sse41',
+    [files_intel_tiled_memcpy_sse41],
+    include_directories : [
+      inc_common, inc_intel, inc_dri_common, inc_drm_uapi,
+    ],
+    link_args : ['-Wl,--exclude-libs=ALL'],
+    c_args : [c_vis_args, no_override_init_args, '-Wl,--exclude-libs=ALL', '-msse2', sse41_args],
+    extra_files : ['intel_tiled_memcpy.c']
+  )
 else
-intel_tiled_memcpy_sse41 = []
+  intel_tiled_memcpy_sse41 = []
 endif