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

meson: Support building Xnest and Xorg on darwin 

Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit ef8101560e)
This commit is contained in:
Jeremy Huddleston Sequoia 2022-06-20 17:08:53 -07:00
parent 433f53a1a0
commit 033d93a021
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/xfree86/meson.build
View File

@ -75,7 +75,7 @@ endif
if host_machine.system() == 'cygwin' or host_machine.system() == 'windows'
linker_export_flags = '-Wl,--export-all-symbols'
elif host_machine.system() == 'sunos'
elif host_machine.system() == 'sunos' or host_machine.system() == 'darwin'
linker_export_flags = []
else
linker_export_flags = '-Wl,--export-dynamic'

6
meson.build
View File

@ -184,8 +184,7 @@ if with_dtrace
endif
build_xorg = false
if (host_machine.system() != 'darwin' and
host_machine.system() != 'windows')
if (host_machine.system() != 'windows')
if get_option('xorg') == 'auto'
build_xorg = (host_machine.system() != 'darwin' and
host_machine.system() != 'windows')
@ -197,8 +196,7 @@ xorgsdkdir = join_paths(get_option('prefix'), get_option('includedir'), 'xorg')
libxcvt_dep = dependency('libxcvt', required: build_xorg)
build_xnest = false
if (host_machine.system() != 'darwin' and
host_machine.system() != 'windows')
if (host_machine.system() != 'windows')
if get_option('xnest') != 'false'
xnest_required = get_option('xnest') == 'true'