diff options
| author | Dylan Baker <[email protected]> | 2018-06-11 10:12:46 -0700 |
|---|---|---|
| committer | Dylan Baker <[email protected]> | 2018-06-13 10:06:23 -0700 |
| commit | 6eaa01368554b57081254ffd473a55199993b98d (patch) | |
| tree | d83b408a90ee4aa6a082e18acfc526b42be5dc99 | |
| parent | 65e447c5df484fcbdad41721e2aba46823147931 (diff) | |
meson: Set include dirs for asm
v2: - split this from the next patch
- Only include x86-64 and not x86 when buiding x86_64
Signed-off-by: Dylan Baker <[email protected]>
Reviewed-by: Eric Engestrom <[email protected]>
Reviewed-by: Matt Turner <[email protected]>
| -rw-r--r-- | src/mesa/meson.build | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/mesa/meson.build b/src/mesa/meson.build index cba361c0988..24b5cc821cc 100644 --- a/src/mesa/meson.build +++ b/src/mesa/meson.build @@ -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, |