[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 011/132] meson: add version.o
From: |
Paolo Bonzini |
Subject: |
[PATCH 011/132] meson: add version.o |
Date: |
Thu, 12 Dec 2019 13:50:55 +0100 |
From: Marc-André Lureau <address@hidden>
Signed-off-by: Marc-André Lureau <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
meson.build | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 18b8710..ba4d891 100644
--- a/meson.build
+++ b/meson.build
@@ -23,8 +23,14 @@ configure_file(input: files('scripts/ninjatool.py'),
m = cc.find_library('m', required: false)
util = cc.find_library('util', required: false)
socket = []
+version_res = []
if host_machine.system() == 'windows'
socket = cc.find_library('ws2_32')
+
+ win = import('windows')
+ version_res = win.compile_resources('version.rc',
+ depend_files:
files('pc-bios/qemu-nsis.ico'),
+ include_directories:
include_directories('.'))
endif
glib = declare_dependency(compile_args: config_host['GLIB_CFLAGS'].split(),
link_args: config_host['GLIB_LIBS'].split())
@@ -177,4 +183,5 @@ util_ss = util_ss.apply(config_host, strict: false)
libqemuutil = static_library('qemuutil',
sources: util_ss.sources() + stub_ss.sources() +
genh,
dependencies: [util_ss.dependencies(), m, glib,
socket])
-qemuutil = declare_dependency(link_with: libqemuutil)
+qemuutil = declare_dependency(link_with: libqemuutil,
+ sources: version_res)
--
1.8.3.1
- [RFC PATCH v3 000/132] Proof of concept for Meson integration, Paolo Bonzini, 2019/12/12
- [PATCH 001/132] build-sys hack: ensure target directory is there, Paolo Bonzini, 2019/12/12
- [PATCH 002/132] configure: do not include $(...) variables in config-host.mak, Paolo Bonzini, 2019/12/12
- [PATCH 003/132] configure: expand path variables for meson configure, Paolo Bonzini, 2019/12/12
- [PATCH 005/132] configure: generate Meson cross file, Paolo Bonzini, 2019/12/12
- [PATCH 006/132] build-sys: add meson submodule, Paolo Bonzini, 2019/12/12
- [PATCH 007/132] meson: enable pie, Paolo Bonzini, 2019/12/12
- [PATCH 008/132] meson: use coverage option, Paolo Bonzini, 2019/12/12
- [PATCH 010/132] meson: add remaining generated tcg trace helpers, Paolo Bonzini, 2019/12/12
- [PATCH 004/132] configure: integrate Meson in the build system, Paolo Bonzini, 2019/12/12
- [PATCH 011/132] meson: add version.o,
Paolo Bonzini <=
- [PATCH 013/132] contrib/vhost-user-blk: convert to Meson, Paolo Bonzini, 2019/12/12
- [PATCH 012/132] contrib/libvhost-user: convert to Meson, Paolo Bonzini, 2019/12/12
- [PATCH 014/132] contrib/vhost-user-scsi: convert to Meson, Paolo Bonzini, 2019/12/12
- [PATCH 015/132] contrib/rdmacm-mux: convert to Meson, Paolo Bonzini, 2019/12/12
- [PATCH 016/132] contrib/vhost-user-input: convert to meson, Paolo Bonzini, 2019/12/12
- [PATCH 017/132] contrib/vhost-user-gpu: convert to meson, Paolo Bonzini, 2019/12/12
- [PATCH 018/132] contrib/ivshmem: convert to meson, Paolo Bonzini, 2019/12/12
- [PATCH 019/132] contrib/elf2dmp: convert to meson, Paolo Bonzini, 2019/12/12
- [PATCH 021/132] meson: convert vss-win32, Paolo Bonzini, 2019/12/12
- [PATCH 020/132] meson: convert qemu-ga, Paolo Bonzini, 2019/12/12