Skip to content

Commit

Permalink
ci/win32: override link args only for the target that needs them
Browse files Browse the repository at this point in the history
Fixes compilation after USE_GAS related fixes upstream. It links
asm_offset.exe, which shouldn't use a .def file.

Fixes: 0125d35
  • Loading branch information
kasper93 committed May 18, 2024
1 parent 0125d35 commit 875378f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion ci/build-win32.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 875378f

Please sign in to comment.