projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added few more stubs so that control reaches to DestroyDevice().
[mesa.git]
/
src
/
meson.build
diff --git
a/src/meson.build
b/src/meson.build
index 53b999ad22aeea92c917e2faffbd323a8f17c348..dfe41d08972ec6e35120aa54c4fcae10b3942c3a 100644
(file)
--- a/
src/meson.build
+++ b/
src/meson.build
@@
-18,8
+18,6
@@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
-inc_common = [inc_include, include_directories(
- '.', 'mapi', 'mesa', 'gallium/include', 'gallium/auxiliary')]
inc_mesa = include_directories('mesa')
inc_mapi = include_directories('mapi')
inc_src = include_directories('.')
inc_mesa = include_directories('mesa')
inc_mapi = include_directories('mapi')
inc_src = include_directories('.')
@@
-31,12
+29,13
@@
inc_amd_common_llvm = include_directories('amd/llvm')
libglsl_util = static_library(
'glsl_util',
files(
libglsl_util = static_library(
'glsl_util',
files(
- 'mesa/main/extensions_table.c', 'mesa/main/imports.c',
- 'mesa/program/prog_parameter.c', 'mesa/program/symbol_table.c',
+ 'mesa/main/extensions_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,
)
@@
-44,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')
@@
-53,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
@@
-84,9
+85,15
@@
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
+if with_libresoc_vk
+ subdir('libre-soc')
+endif
subdir('mesa')
subdir('loader')
if with_platform_haiku
subdir('mesa')
subdir('loader')
if with_platform_haiku
@@
-122,6
+129,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