From 6faf3c1acd26040371ea0a5a387217d6cd85d022 Mon Sep 17 00:00:00 2001 From: Tatsuyuki Ishi Date: Fri, 19 Jan 2024 10:02:50 +0900 Subject: [build] Don't pass unix compiler and link args to MSVC clang-cl accepts both style of options but these will be generally meaningless: - Static CRT is unnecessary. - File alignment will be introduced in another commit. - Wine has partial support for PDB backtrace so there is probably no need to insist on DWARF (which is unsupported by real MSVC anyway). - MSVC doesn't have the weird stdcall ordinal naming convention that necessiates fixup and kill-at. --- meson.build | 42 ++++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/meson.build b/meson.build index abe9a1e0..acd8d308 100644 --- a/meson.build +++ b/meson.build @@ -48,28 +48,30 @@ if platform == 'windows' '-D_WIN32_WINNT=0xa00', ] - link_args += [ - '-static', - '-static-libgcc', - '-static-libstdc++', - # We need to set the section alignment for debug symbols to - # work properly as well as avoiding a memcpy from the Wine loader. - '-Wl,--file-alignment=4096', - ] - - # Wine's built-in back traces only work with dwarf4 symbols - if get_option('debug') - compiler_args += [ - '-gdwarf-4', - ] - endif - - # Enable stdcall fixup on 32-bit - if cpu_family == 'x86' + if not dxvk_is_msvc link_args += [ - '-Wl,--enable-stdcall-fixup', - '-Wl,--kill-at', + '-static', + '-static-libgcc', + '-static-libstdc++', + # We need to set the section alignment for debug symbols to + # work properly as well as avoiding a memcpy from the Wine loader. + '-Wl,--file-alignment=4096', ] + + # Wine's built-in back traces only work with dwarf4 symbols + if get_option('debug') + compiler_args += [ + '-gdwarf-4', + ] + endif + + # Enable stdcall fixup on 32-bit + if cpu_family == 'x86' + link_args += [ + '-Wl,--enable-stdcall-fixup', + '-Wl,--kill-at', + ] + endif endif lib_d3d9 = cpp.find_library('d3d9') -- cgit v1.2.3