meson: inline `inc_common`

[mesa.git] / src / gallium / state_trackers / omx / meson.build

diff --git a/src/gallium/state_trackers/omx/meson.build b/src/gallium/state_trackers/omx/meson.build
index b0c71a895ff5d12e2bd2e94e8b3b0fb1413e42bf..35866c1cba0281b4c4303c683926f794c0cd6b45 100644 (file)
--- a/src/gallium/state_trackers/omx/meson.build
+++ b/src/gallium/state_trackers/omx/meson.build
@@ -1,4 +1,4 @@
-# Copyright © 2017 Intel Corporation
+# Copyright © 2017, 2019 Intel Corporation
 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -18,54 +18,54 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-inc_st_omx = [inc_common]
-dep_st_omx = [dep_omx, dep_x11_xcb, dep_xcb, dep_xcb_dri2, dep_xcb_dri3]
+inc_st_omx = [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux]
+dep_st_omx = [
+  dep_omx, dep_x11_xcb, dep_xcb, dep_xcb_dri2, dep_xcb_dri3, dep_libdrm,
+]
 
 files_omx = files(
-       'vid_dec_common.c',
-       'vid_dec_h264_common.c',
-       'vid_enc_common.c',
-       'vid_omx_common.c'
+  'vid_dec_common.c',
+  'vid_dec_h264_common.c',
+  'vid_enc_common.c',
+  'vid_omx_common.c'
 )
 
 if with_gallium_omx == 'bellagio'
-files_omx += files(
-  'bellagio/entrypoint.c',
-  'bellagio/vid_dec.c',
-  'bellagio/vid_dec_mpeg12.c',
-  'bellagio/vid_dec_h264.c',
-  'bellagio/vid_dec_h265.c',
-  'bellagio/vid_enc.c'
-)
+  files_omx += files(
+    'bellagio/entrypoint.c',
+    'bellagio/vid_dec.c',
+    'bellagio/vid_dec_mpeg12.c',
+    'bellagio/vid_dec_h264.c',
+    'bellagio/vid_dec_h265.c',
+    'bellagio/vid_enc.c'
+  )
 elif with_gallium_omx == 'tizonia'
-files_omx += files(
-  'tizonia/entrypoint.c',
-        'tizonia/h264d.c',
-        'tizonia/h264dprc.c',
-        'tizonia/h264dinport.c',
-        'tizonia/h264e.c',
-        'tizonia/h264eprc.c',
-        'tizonia/h264einport.c',
-        'tizonia/h264eoutport.c'
-)
-inc_st_omx = [
-  inc_st_omx,
-  inc_dri_common,
-  include_directories('../../state_trackers/dri'),
-  include_directories('../../../egl/drivers/dri2'),
-  include_directories('../../../egl/main'),
-  include_directories('../../../egl'),
-  include_directories('../../../gbm/backends/dri'),
-  include_directories('../../../gbm/main'),
-  include_directories('../../../loader')
-]
-dep_st_omx = [dep_st_omx, dep_omx_other, dep_libdrm]
+  files_omx += files(
+    'tizonia/entrypoint.c',
+     'tizonia/h264d.c',
+     'tizonia/h264dprc.c',
+     'tizonia/h264dinport.c',
+     'tizonia/h264e.c',
+     'tizonia/h264eprc.c',
+     'tizonia/h264einport.c',
+     'tizonia/h264eoutport.c'
+  )
+  inc_st_omx = [
+    inc_st_omx,
+    inc_dri_common,
+    inc_loader,
+    inc_gbm,
+    inc_st_dri,
+    inc_egl,
+    inc_egl_dri2,
+  ]
+  dep_st_omx = [dep_st_omx, dep_omx_other]
 endif
 
 libomx_st = static_library(
   'omx_st',
   files_omx,
-  c_args : [c_vis_args],
+  c_args : [c_vis_args, '-fcommon'],
   include_directories : inc_st_omx,
   dependencies : dep_st_omx,
 )