projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
util: rename xmlpool.h to driconf.h
[mesa.git]
/
src
/
glx
/
meson.build
diff --git
a/src/glx/meson.build
b/src/glx/meson.build
index 3079959145b7b2f0760c77cd8a9a03cb81879d77..bceed2f5fc7e05ccd98c257c55733b42e3098f39 100644
(file)
--- a/
src/glx/meson.build
+++ b/
src/glx/meson.build
@@
-30,6
+30,12
@@
files_libglx = files(
'clientinfo.c',
'compsize.c',
'create_context.c',
'clientinfo.c',
'compsize.c',
'create_context.c',
+ 'dri_common.c',
+ 'dri_common.h',
+ 'dri_common_query_renderer.c',
+ 'dri_common_interop.c',
+ 'drisw_glx.c',
+ 'drisw_priv.h',
'eval.c',
'glxclient.h',
'glxcmds.c',
'eval.c',
'glxclient.h',
'glxcmds.c',
@@
-64,26
+70,15
@@
files_libglx = files(
'single2.c',
'singlepix.c',
'vertarr.c',
'single2.c',
'singlepix.c',
'vertarr.c',
+ 'xfont.c',
)
extra_libs_libglx = []
extra_deps_libgl = []
extra_ld_args_libgl = []
)
extra_libs_libglx = []
extra_deps_libgl = []
extra_ld_args_libgl = []
-if with_glx == 'dri'
- files_libglx += files(
- 'dri_common.c',
- 'dri_common.h',
- 'dri_common_query_renderer.c',
- 'dri_common_interop.c',
- 'xfont.c',
- 'drisw_glx.c',
- 'drisw_priv.h',
- )
-endif
-
# dri2
# dri2
-if with_
glx == 'dri' and with_
dri_platform == 'drm' and dep_libdrm.found()
+if with_dri_platform == 'drm' and dep_libdrm.found()
files_libglx += files(
'dri2.c',
'dri2_glx.c',
files_libglx += files(
'dri2.c',
'dri2_glx.c',
@@
-139,16
+134,20
@@
gl_lib_cargs = [
libglx = static_library(
'glx',
[files_libglx, glx_generated],
libglx = static_library(
'glx',
[files_libglx, glx_generated],
- include_directories : [inc_
common
, inc_glapi, inc_loader],
+ include_directories : [inc_
include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux
, inc_glapi, inc_loader],
c_args : [
c_args : [
-
c_vis_args,
gl_lib_cargs,
+ gl_lib_cargs,
'-DGL_LIB_NAME="lib@0@.so.@1@"'.format(gl_lib_name, gl_lib_version.split('.')[0]),
],
'-DGL_LIB_NAME="lib@0@.so.@1@"'.format(gl_lib_name, gl_lib_version.split('.')[0]),
],
+ gnu_symbol_visibility : 'hidden',
link_with : [
link_with : [
- libloader, libloader_dri3_helper,
libxmlconfig,
+ libloader, libloader_dri3_helper,
extra_libs_libglx,
],
extra_libs_libglx,
],
- dependencies : [idep_mesautil, dep_libdrm, dep_dri2proto, dep_glproto, dep_x11, dep_glvnd],
+ dependencies : [
+ idep_mesautil, idep_xmlconfig,
+ dep_libdrm, dep_dri2proto, dep_glproto, dep_x11, dep_glvnd,
+ ],
)
libgl = shared_library(
)
libgl = shared_library(