瀏覽代碼

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 <dylan.c.baker@intel.com>
Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
tags/18.2-branchpoint
Dylan Baker 7 年之前
父節點
當前提交
6eaa013685
共有 1 個檔案被更改,包括 6 行新增2 行删除
  1. 6
    2
      src/mesa/meson.build

+ 6
- 2
src/mesa/meson.build 查看文件

capture : true, capture : true,
) )
endif endif

inc_libmesa_asm = []
if with_asm_arch == 'x86' if with_asm_arch == 'x86'
files_libmesa_common += files( files_libmesa_common += files(
'x86/assyntax.h', 'x86/assyntax.h',
'x86/sse_normal.S', 'x86/sse_normal.S',
'x86/read_rgba_span_x86.S', 'x86/read_rgba_span_x86.S',
) )
inc_libmesa_asm = include_directories('x86')
elif with_asm_arch == 'x86_64' elif with_asm_arch == 'x86_64'
files_libmesa_common += files('x86-64/x86-64.h', 'x86-64/xform4.S') files_libmesa_common += files('x86-64/x86-64.h', 'x86-64/xform4.S')
inc_libmesa_asm = include_directories('x86-64')
endif endif
# TODO: sparc # TODO: sparc


[files_libmesa_common, files_libmesa_classic], [files_libmesa_common, files_libmesa_classic],
c_args : [c_vis_args, c_msvc_compat_args], c_args : [c_vis_args, c_msvc_compat_args],
cpp_args : [cpp_vis_args, cpp_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], link_with : [libglsl, libmesa_sse41],
dependencies : idep_nir_headers, dependencies : idep_nir_headers,
build_by_default : false, build_by_default : false,
[files_libmesa_common, files_libmesa_gallium], [files_libmesa_common, files_libmesa_gallium],
c_args : [c_vis_args, c_msvc_compat_args], c_args : [c_vis_args, c_msvc_compat_args],
cpp_args : [cpp_vis_args, cpp_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], link_with : [libglsl, libmesa_sse41],
dependencies : [idep_nir_headers, dep_vdpau], dependencies : [idep_nir_headers, dep_vdpau],
build_by_default : false, build_by_default : false,

Loading…
取消
儲存