aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Manning <gmanning@rapitasystems.com>2023-11-06 18:51:06 +0000
committerAlex Bennée <alex.bennee@linaro.org>2023-11-08 15:15:23 +0000
commit36fa07739450a02a92244a4f0c6973c1df7a9a0c (patch)
tree619a50681c5b871ff11f9181f66fd632dfa5c75b
parentf8347d05df3709fd4b62629b2c92b9ad130831f9 (diff)
downloadqemu-36fa07739450a02a92244a4f0c6973c1df7a9a0c.zip
qemu-36fa07739450a02a92244a4f0c6973c1df7a9a0c.tar.gz
qemu-36fa07739450a02a92244a4f0c6973c1df7a9a0c.tar.bz2
plugins: allow plugins to be enabled on windows
allow plugins to be enabled in the configure script on windows. Also, add the qemu_plugin_api.lib to the installer. Signed-off-by: Greg Manning <gmanning@rapitasystems.com> Reviewed-by: Alex Bennée <alex.bennee@linaro.org> Message-Id: <20231102172053.17692-5-gmanning@rapitasystems.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> [AJB: add check for dlltool to configure] Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Message-Id: <20231106185112.2755262-17-alex.bennee@linaro.org>
-rwxr-xr-xconfigure4
-rw-r--r--meson.build5
2 files changed, 7 insertions, 2 deletions
diff --git a/configure b/configure
index e50ec99..abcb199 100755
--- a/configure
+++ b/configure
@@ -1011,9 +1011,9 @@ if test "$targetos" = "bogus"; then
fi
# test for any invalid configuration combinations
-if test "$targetos" = "windows"; then
+if test "$targetos" = "windows" && ! has "$dlltool"; then
if test "$plugins" = "yes"; then
- error_exit "TCG plugins not currently supported on Windows platforms"
+ error_exit "TCG plugins requires dlltool to build on Windows platforms"
fi
plugins="no"
fi
diff --git a/meson.build b/meson.build
index 4848930..d7d841e 100644
--- a/meson.build
+++ b/meson.build
@@ -3944,6 +3944,11 @@ endforeach
if get_option('plugins')
install_headers('include/qemu/qemu-plugin.h')
+ if targetos == 'windows'
+ # On windows, we want to deliver the qemu_plugin_api.lib file in the qemu installer,
+ # so that plugin authors can compile against it.
+ install_data(win32_qemu_plugin_api_lib, install_dir: 'lib')
+ endif
endif
subdir('qga')