[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 039/132] meson: add macos dependencies
From: |
Paolo Bonzini |
Subject: |
[PATCH 039/132] meson: add macos dependencies |
Date: |
Thu, 12 Dec 2019 13:51:23 +0100 |
From: Marc-André Lureau <address@hidden>
There is no probing in configure, so no need to pass them as
variables to meson. Do a regular meson dependency() instead.
Signed-off-by: Marc-André Lureau <address@hidden>
---
meson.build | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/meson.build b/meson.build
index 5949e6d..8d5b28b 100644
--- a/meson.build
+++ b/meson.build
@@ -9,7 +9,7 @@ config_all_disas = kconfig.load(meson.current_build_dir() /
'config-all-disas.ma
add_project_arguments(config_host['CFLAGS'].split(),
language: ['c', 'objc'])
add_project_arguments(config_host['QEMU_CFLAGS'].split(),
- language: 'c')
+ language: ['c', 'objc'])
add_project_arguments(config_host['QEMU_CXXFLAGS'].split(),
language: 'cpp')
add_project_link_arguments(config_host['LDFLAGS'].split(),
@@ -17,7 +17,7 @@ add_project_link_arguments(config_host['LDFLAGS'].split(),
add_project_link_arguments(config_host['QEMU_LDFLAGS'].split(),
language: ['c', 'cpp', 'objc'])
add_project_arguments(config_host['QEMU_INCLUDES'].split(),
- language: ['c', 'cpp'])
+ language: ['c', 'cpp', 'objc'])
qemu_version_cmd = [find_program('scripts/qemu-version.sh'),
meson.current_source_dir(),
@@ -37,6 +37,10 @@ m = cc.find_library('m', required: false)
util = cc.find_library('util', required: false)
socket = []
version_res = []
+coref = []
+iokit = []
+cocoa = []
+hvf = []
if host_machine.system() == 'windows'
socket = cc.find_library('ws2_32')
@@ -44,6 +48,12 @@ if host_machine.system() == 'windows'
version_res = win.compile_resources('version.rc',
depend_files:
files('pc-bios/qemu-nsis.ico'),
include_directories:
include_directories('.'))
+elif host_machine.system() == 'darwin'
+ add_languages('objc', required: false)
+ coref = dependency('appleframeworks', modules: 'CoreFoundation')
+ iokit = dependency('appleframeworks', modules: 'IOKit')
+ cocoa = dependency('appleframeworks', modules: 'Cocoa')
+ hvf = dependency('appleframeworks', modules: 'Hypervisor')
endif
glib = declare_dependency(compile_args: config_host['GLIB_CFLAGS'].split(),
link_args: config_host['GLIB_LIBS'].split())
--
1.8.3.1
- [PATCH 026/132] meson: add virtfs-proxy-helper, (continued)
- [PATCH 026/132] meson: add virtfs-proxy-helper, Paolo Bonzini, 2019/12/12
- [PATCH 028/132] meson: generate qemu-version.h, Paolo Bonzini, 2019/12/12
- [PATCH 030/132] meson: generate hxtool files, Paolo Bonzini, 2019/12/12
- [PATCH 031/132] meson: configure 50-qemu-gpu.json, Paolo Bonzini, 2019/12/12
- [PATCH 032/132] meson: uncompress edk2 bios, Paolo Bonzini, 2019/12/12
- [PATCH 033/132] build-sys hack: link with whole .fa archives, Paolo Bonzini, 2019/12/12
- [PATCH 035/132] meson: convert authz directory to Meson, Paolo Bonzini, 2019/12/12
- [PATCH 034/132] meson: convert qom directory to Meson, Paolo Bonzini, 2019/12/12
- [PATCH 036/132] meson: convert crypto directory to Meson, Paolo Bonzini, 2019/12/12
- [PATCH 037/132] meson: convert io directory to Meson, Paolo Bonzini, 2019/12/12
- [PATCH 039/132] meson: add macos dependencies,
Paolo Bonzini <=
- [PATCH 038/132] meson: infrastructure for building emulators, Paolo Bonzini, 2019/12/12
- [PATCH 041/132] meson: convert chardev directory to Meson (tools part), Paolo Bonzini, 2019/12/12
- [PATCH 043/132] meson: qemu-{img,io,nbd}, Paolo Bonzini, 2019/12/12
- [PATCH 042/132] meson: convert block, Paolo Bonzini, 2019/12/12
- [PATCH 044/132] meson: qemu-pr-helper, Paolo Bonzini, 2019/12/12
- [PATCH 040/132] meson: add modules infrastructure, Paolo Bonzini, 2019/12/12
- [PATCH 045/132] configure, Makefile; remove TOOLS and HELPERS-y variable, Paolo Bonzini, 2019/12/12
- [PATCH 046/132] meson: convert chardev directory to Meson (emulator part), Paolo Bonzini, 2019/12/12
- [PATCH 047/132] meson: convert audio directory to Meson, Paolo Bonzini, 2019/12/12
- [PATCH 049/132] meson: convert root directory to Meson, Paolo Bonzini, 2019/12/12