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

XQuartz: Build the bundle trampoline when using meson 

This brings the change for e1fdc856ae into meson based builds

Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit b00cf4aef8)
This commit is contained in:
Jeremy Huddleston Sequoia 2022-06-26 02:40:20 -07:00
parent 033d93a021
commit 66ac50090d
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/xquartz/bundle/meson.build
View File

@ -57,7 +57,6 @@ install_data('PkgInfo',
install_mode: 'rw-r--r--') install_mode: 'rw-r--r--')
install_data('X11.sh', install_data('X11.sh',
rename: 'X11',
install_dir: join_paths(bundle_root, 'Contents/MacOS'), install_dir: join_paths(bundle_root, 'Contents/MacOS'),
install_mode: 'rwxr-xr-x') install_mode: 'rwxr-xr-x')

11
hw/xquartz/mach-startup/meson.build
View File

@ -70,6 +70,17 @@ x11_bin = executable('X11.bin',
install_dir: x11appdir, install_dir: x11appdir,
) )
# X11 (Bundle trampoline)
x11 = executable('X11',
[
'bundle_trampoline.c',
],
c_args: xquartz_defs,
link_args: ['-Objc'],
install: true,
install_dir: x11appdir,
)
# Xquartz # Xquartz
xquartz_deps = [ xquartz_deps = [
dependency('CoreServices', method: 'extraframework'), dependency('CoreServices', method: 'extraframework'),