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>
This commit is contained in:
Jeremy Huddleston Sequoia 2022-06-20 17:08:53 -07:00
parent 6645ff5906
commit ef8101560e
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' if host_machine.system() == 'cygwin' or host_machine.system() == 'windows'
linker_export_flags = '-Wl,--export-all-symbols' 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 = [] linker_export_flags = []
else else
linker_export_flags = '-Wl,--export-dynamic' linker_export_flags = '-Wl,--export-dynamic'

6
meson.build
View File

@ -184,8 +184,7 @@ if with_dtrace
endif endif
build_xorg = false build_xorg = false
if (host_machine.system() != 'darwin' and if (host_machine.system() != 'windows')
host_machine.system() != 'windows')
if get_option('xorg') == 'auto' if get_option('xorg') == 'auto'
build_xorg = (host_machine.system() != 'darwin' and build_xorg = (host_machine.system() != 'darwin' and
host_machine.system() != 'windows') host_machine.system() != 'windows')
@ -230,8 +229,7 @@ if (host_machine.system() != 'darwin' and
endif endif
build_xnest = false build_xnest = false
if (host_machine.system() != 'darwin' and if (host_machine.system() != 'windows')
host_machine.system() != 'windows')
if get_option('xnest') != 'false' if get_option('xnest') != 'false'
xnest_required = get_option('xnest') == 'true' xnest_required = get_option('xnest') == 'true'