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

meson: Set include dirs for asm

Browse Source 
v2: - split this from the next patch
    - Only include x86-64 and not x86 when buiding x86_64

Signed-off-by: Dylan Baker <dylan.c.baker@intel.com>
Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
This commit is contained in:
Dylan Baker
2018-06-11 10:12:46 -07:00
parent 65e447c5df
commit 6eaa013685
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/meson.build
+6 -2
View File
@@ -613,6 +613,8 @@ if with_asm_arch == 'x86' or with_asm_arch == 'x86_64'
capture : true,
)
endif
inc_libmesa_asm = []
if with_asm_arch == 'x86'
files_libmesa_common += files(
'x86/assyntax.h',
@@ -643,8 +645,10 @@ if with_asm_arch == 'x86'
'x86/sse_normal.S',
'x86/read_rgba_span_x86.S',
)
inc_libmesa_asm = include_directories('x86')
elif with_asm_arch == 'x86_64'
files_libmesa_common += files('x86-64/x86-64.h', 'x86-64/xform4.S')
inc_libmesa_asm = include_directories('x86-64')
endif
# TODO: sparc
@@ -710,7 +714,7 @@ libmesa_classic = static_library(
[files_libmesa_common, files_libmesa_classic],
c_args : [c_vis_args, c_msvc_compat_args],
cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
include_directories : [inc_common, include_directories('main')],
include_directories : [inc_common, inc_libmesa_asm, include_directories('main')],
link_with : [libglsl, libmesa_sse41],
dependencies : idep_nir_headers,
build_by_default : false,
@@ -721,7 +725,7 @@ libmesa_gallium = static_library(
[files_libmesa_common, files_libmesa_gallium],
c_args : [c_vis_args, c_msvc_compat_args],
cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
include_directories : [inc_common, include_directories('main')],
include_directories : [inc_common, inc_libmesa_asm, include_directories('main')],
link_with : [libglsl, libmesa_sse41],
dependencies : [idep_nir_headers, dep_vdpau],
build_by_default : false,