frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

meson: Add HAVE_LIBDISPATCH define to xquartz build. 

Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Eric Anholt 2018-08-07 16:23:12 -07:00 committed by Adam Jackson
parent 843e44adf1
commit 9869512cbf
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hw/xquartz/meson.build
View File

@ -17,6 +17,18 @@ srcs = [
'../../mi/miinitext.c', '../../mi/miinitext.c',
] ]
xquartz_c_args = [
'-DXFree86Server',
# XXXX: BUILD_DATE
'-DXSERVER_VERSION="' + meson_project.version() + '"',
'-DINXQUARTZ',
'-DUSE_NEW_CLUT',
]
if cc.has_function('dispatch_async')
xquartz_c_args += '-DHAVE_LIBDISPATCH'
endif
executable( executable(
'Xquartz', 'Xquartz',
srcs, srcs,
@ -29,12 +41,6 @@ executable(
libxserver_glx, libxserver_glx,
libxserver_pseudoramix, libxserver_pseudoramix,
], ],
c_args: [ c_args: xquartz_c_args,
'-DXFree86Server',
# XXXX: BUILD_DATE
'-DXSERVER_VERSION="' + meson_project.version() + '"',
'-DINXQUARTZ',
'-DUSE_NEW_CLUT',
],
install: true, install: true,
) )

1
include/meson.build
View File

@ -54,7 +54,6 @@ conf_data.set('HAS_APERTURE_DRV', host_machine.system() == 'openbsd')
# XXX: FALLBACK_INPUT_DRIVER # XXX: FALLBACK_INPUT_DRIVER
# XXX: BUNDLE_ID_PREFIX # XXX: BUNDLE_ID_PREFIX
# XXX: HAVE_LIBDISPATCH
conf_data.set_quoted('OSNAME', 'Linux') # XXX conf_data.set_quoted('OSNAME', 'Linux') # XXX
conf_data.set('HAVE_INPUTTHREAD', '1') # XXX conf_data.set('HAVE_INPUTTHREAD', '1') # XXX