]> git.ipfire.org Git - thirdparty/qemu.git/commitdiff
plugins: allow plugins to be enabled on windows
authorGreg Manning <gmanning@rapitasystems.com>
Mon, 6 Nov 2023 18:51:06 +0000 (18:51 +0000)
committerAlex Bennée <alex.bennee@linaro.org>
Wed, 8 Nov 2023 15:15:23 +0000 (15:15 +0000)
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>

configure
meson.build

index e50ec99fe21cb40c5fbc21b35f5e0c8eeb1c4bcb..abcb199aa87d233fffb34166372b1e9c827df753 100755 (executable)
--- 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
index 4848930680baa5b624c25368c81f1d92e4d94234..d7d841e71ecbe682bd0446833ec4aec54b5e061d 100644 (file)
@@ -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')