AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

meson: inline inc_common

Browse Source 
Let's make it clear what includes are being added everywhere, so that
they can be cleaned up.

Signed-off-by: Eric Engestrom <eric@engestrom.ch>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4360>
This commit is contained in:
Eric Engestrom
2019-03-05 16:21:47 +00:00
parent 5a32dda8e6
commit 79af30768d
98 changed files with 199 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/intel/tools/imgui/meson.build
+1 -1
View File
@@ -6,7 +6,7 @@ libintel_imgui_gtk_deps = [
libintel_imgui_gtk = static_library(
'intel_imgui_gtk',
files('imgui_impl_gtk3.cpp', 'imgui_impl_opengl3.cpp'),
include_directories: inc_common,
include_directories: [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
dependencies : libintel_imgui_gtk_deps,
cpp_args : ['-w'],
install: false
src/intel/tools/meson.build
+9 -9
View File
@@ -21,7 +21,7 @@
libaub = static_library(
'aub',
files('aub_read.c', 'aub_mem.c'),
include_directories : [inc_common, inc_intel],
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel],
dependencies : idep_mesautil,
link_with : [libintel_common, libintel_dev],
c_args : [c_vis_args, no_override_init_args],
@@ -32,7 +32,7 @@ aubinator = executable(
'aubinator',
files('aubinator.c'),
dependencies : [idep_mesautil, dep_expat, dep_zlib, dep_dl, dep_thread, dep_m],
include_directories : [inc_common, inc_intel],
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel],
link_with : [libintel_common, libintel_compiler, libintel_dev, libaub],
c_args : [c_vis_args, no_override_init_args],
install : true
@@ -42,7 +42,7 @@ aubinator_error_decode = executable(
'aubinator_error_decode',
files('aubinator_error_decode.c'),
dependencies : [idep_mesautil, dep_zlib, dep_thread],
include_directories : [inc_common, inc_intel],
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel],
link_with : [libintel_common, libintel_compiler, libintel_dev],
c_args : [c_vis_args, no_override_init_args],
install : true
@@ -52,7 +52,7 @@ i965_disasm = executable(
'i965_disasm',
files('i965_disasm.c'),
dependencies : [idep_mesautil, dep_thread],
include_directories : [inc_common, inc_intel],
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel],
link_with : [libintel_common, libintel_compiler, libintel_dev],
c_args : [c_vis_args, no_override_init_args],
install : true
@@ -62,7 +62,7 @@ error2aub = executable(
'intel_error2aub',
files('aub_write.h', 'aub_write.c', 'error2aub.c'),
dependencies : [dep_zlib, dep_dl, dep_thread, dep_m],
include_directories : [inc_common, inc_intel, inc_include],
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel],
link_with : [libintel_dev],
c_args : [c_vis_args, no_override_init_args],
install : true
@@ -85,7 +85,7 @@ libintel_sanitize_gpu = shared_library(
'intel_sanitize_gpu',
files('intel_sanitize_gpu.c'),
dependencies : [idep_mesautil, dep_dl, dep_thread],
include_directories : [inc_common, inc_intel, inc_include],
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel],
link_with : libintel_common,
c_args : [c_vis_args, no_override_init_args, c_sse2_args],
install_dir : get_option('libexecdir'),
@@ -107,7 +107,7 @@ libintel_dump_gpu = shared_library(
'aub_write.h', 'aub_write.c', 'intel_dump_gpu.c',
),
dependencies : dep_dl,
include_directories : [inc_common, inc_intel, inc_include],
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel],
link_with : libintel_dev,
c_args : [c_vis_args, no_override_init_args],
install_dir : get_option('libexecdir'),
@@ -121,7 +121,7 @@ if with_tools.contains('intel-ui')
'aubinator_viewer',
files('aubinator_viewer.cpp', 'aubinator_viewer_decoder.cpp'),
dependencies : [idep_mesautil, dep_zlib, dep_dl, dep_thread, dep_m, libintel_imgui_gtk_dep],
include_directories : [inc_common, inc_intel],
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel],
link_with : [libintel_common, libintel_compiler, libintel_dev, libaub],
c_args : [c_vis_args, no_override_init_args],
cpp_args : ['-fpermissive', '-Wno-parentheses', '-Wno-class-memaccess'],
@@ -150,7 +150,7 @@ i965_asm = executable(
'i965_asm',
['i965_asm.c', i965_gram_tab[0], i965_gram_tab[1], i965_lex_yy_c],
dependencies : [idep_mesautil, dep_thread],
include_directories : [inc_common, inc_intel],
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel],
link_with : [libintel_common, libintel_compiler, libintel_dev],
c_args : [c_vis_args, no_override_init_args],
install : true