From 875378ff0142f7946fb24231a4aa778692800555 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= Date: Sun, 19 May 2024 01:05:42 +0200 Subject: [PATCH] ci/win32: override link args only for the target that needs them Fixes compilation after USE_GAS related fixes upstream. It links asm_offset.exe, which shouldn't use a .def file. Fixes: 0125d359545ba2081a899834f80eeca5a721f33a --- ci/build-win32.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/build-win32.ps1 b/ci/build-win32.ps1 index ace54236b3..b776d393f9 100644 --- a/ci/build-win32.ps1 +++ b/ci/build-win32.ps1 @@ -112,7 +112,7 @@ opts.add_cmake_defines({ 'UPDATE_DEPS': 'ON', 'USE_GAS': 'ON', }) -opts.append_link_args(['-lcfgmgr32', '-Wl,/def:../subprojects/vulkan-loader/loader/vulkan-1.def']) +opts.append_link_args(['-lcfgmgr32', '-Wl,/def:../subprojects/vulkan-loader/loader/vulkan-1.def'], target: 'vulkan') vulkan_proj = cmake.subproject('vulkan-loader', options: opts) vulkan_dep = vulkan_proj.dependency('vulkan') meson.override_dependency('vulkan', vulkan_dep)