projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ac/llvm: fix unaligned VS input loads on gfx10.3
[mesa.git]
/
src
/
meson.build
diff --git
a/src/meson.build
b/src/meson.build
index 992a97399301f60b2f6eb17a61d6f34039ae7001..ed0a3091d6dfd4f3ed662c9ca654175491717019 100644
(file)
--- a/
src/meson.build
+++ b/
src/meson.build
@@
-25,17
+25,17
@@
inc_gallium = include_directories('gallium/include')
inc_gallium_aux = include_directories('gallium/auxiliary')
inc_amd_common = include_directories('amd/common')
inc_amd_common_llvm = include_directories('amd/llvm')
inc_gallium_aux = include_directories('gallium/auxiliary')
inc_amd_common = include_directories('amd/common')
inc_amd_common_llvm = include_directories('amd/llvm')
-inc_common = [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux]
libglsl_util = static_library(
'glsl_util',
files(
'mesa/main/extensions_table.c',
libglsl_util = static_library(
'glsl_util',
files(
'mesa/main/extensions_table.c',
- 'mesa/program/prog_parameter.c', 'mesa/program/symbol_table.c',
+ 'mesa/program/prog_parameter.c',
+ 'mesa/program/symbol_table.c',
'mesa/program/dummy_errors.c',
),
'mesa/program/dummy_errors.c',
),
- include_directories : [inc_
common
],
-
c_args : [c_vis_args]
,
+ include_directories : [inc_
include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux
],
+
gnu_symbol_visibility : 'hidden'
,
build_by_default : false,
)
build_by_default : false,
)
@@
-43,7
+43,8
@@
sha1_h = custom_target(
'git_sha1.h',
output : 'git_sha1.h',
command : [prog_python, git_sha1_gen_py, '--output', '@OUTPUT@'],
'git_sha1.h',
output : 'git_sha1.h',
command : [prog_python, git_sha1_gen_py, '--output', '@OUTPUT@'],
- build_always : true, # commit sha1 can change without having touched these files
+ build_by_default : true,
+ build_always_stale : true, # commit sha1 can change without having touched these files
)
subdir('gtest')
)
subdir('gtest')
@@
-52,6
+53,7
@@
if cc.get_id() == 'msvc'
else
idep_getopt = null_dep
endif
else
idep_getopt = null_dep
endif
+subdir('android_stub')
subdir('util')
subdir('mapi')
# TODO: opengl
subdir('util')
subdir('mapi')
# TODO: opengl
@@
-83,6
+85,9
@@
endif
if with_gallium_panfrost or with_gallium_lima
subdir('panfrost')
endif
if with_gallium_panfrost or with_gallium_lima
subdir('panfrost')
endif
+if with_gallium_virgl
+ subdir('virtio')
+endif
if with_dri_i965 or with_intel_vk or with_gallium_iris
subdir('intel')
endif
if with_dri_i965 or with_intel_vk or with_gallium_iris
subdir('intel')
endif
@@
-121,6
+126,6
@@
if with_glx != 'disabled' and not with_glvnd
libraries : libgl,
libraries_private : gl_priv_libs,
requires_private : gl_priv_reqs,
libraries : libgl,
libraries_private : gl_priv_libs,
requires_private : gl_priv_reqs,
- variables : ['glx_tls=
yes'
],
+ variables : ['glx_tls=
@0@'.format(use_elf_tls ? 'yes' : 'no')
],
)
endif
)
endif