summaryrefslogtreecommitdiff
path: root/glx
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2017-03-11 10:24:04 -0800
committerEric Anholt <eric@anholt.net>2017-04-26 15:25:27 -0700
commit1549e30372756cfdb85379fd8d93c769297ab6e6 (patch)
tree6160835c9dbe15e39ce799f8b1f6a6fdedd89825 /glx
parentc7be7a688a78a34f61b90c0d95914e14b90b0cdc (diff)
Add a Meson build system alongside autotools.
This is a work in progress that builds Xvfb, Xephyr, Xwayland, Xnest, and Xdmx so far. The outline of Xquartz/Xwin support is in tree, but hasn't been built yet. The unit tests are also not done. The intent is to build this as a complete replacement for the autotools system, then eventually replace autotools. meson is faster to generate the build, faster to run the bulid, shorter to write the build files in, and less error-prone than autotools. v2: Fix indentation nits, move version declaration to project(), use existing meson_options for version-config.h's vendor name/web. Signed-off-by: Eric Anholt <eric@anholt.net> Acked-by: Keith Packard <keithp@keithp.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'glx')
-rw-r--r--glx/meson.build50
1 files changed, 50 insertions, 0 deletions
diff --git a/glx/meson.build b/glx/meson.build
new file mode 100644
index 000000000..a29e53cfa
--- /dev/null
+++ b/glx/meson.build
@@ -0,0 +1,50 @@
+srcs_glx = [
+ 'indirect_dispatch.c',
+ 'indirect_dispatch_swap.c',
+ 'indirect_reqsize.c',
+ 'indirect_size_get.c',
+ 'indirect_table.c',
+ 'clientinfo.c',
+ 'createcontext.c',
+ 'extension_string.c',
+ 'indirect_util.c',
+ 'indirect_program.c',
+ 'indirect_texture_compression.c',
+ 'glxcmds.c',
+ 'glxcmdsswap.c',
+ 'glxext.c',
+ 'glxdriswrast.c',
+ 'glxdricommon.c',
+ 'glxscreens.c',
+ 'render2.c',
+ 'render2swap.c',
+ 'renderpix.c',
+ 'renderpixswap.c',
+ 'rensize.c',
+ 'single2.c',
+ 'single2swap.c',
+ 'singlepix.c',
+ 'singlepixswap.c',
+ 'singlesize.c',
+ 'swap_interval.c',
+ 'xfont.c',
+]
+
+libxserver_glx = ''
+if build_glx
+ libxserver_glx = static_library('libxserver_glx',
+ srcs_glx,
+ include_directories: inc,
+ dependencies: [
+ common_dep,
+ dl_dep,
+ dependency('glproto', version: '>= 1.4.17'),
+ dependency('gl', version: '>= 9.2.0'),
+ ],
+ c_args: [
+ glx_align64,
+ # XXX: generated code includes an unused function
+ '-Wno-unused-function',
+ ]
+ )
+endif