Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/doitsujin/dxvk.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTatsuyuki Ishi <ishitatsuyuki@gmail.com>2024-01-19 04:02:50 +0300
committerPhilip Rebohle <25567304+doitsujin@users.noreply.github.com>2024-01-23 17:45:42 +0300
commit6faf3c1acd26040371ea0a5a387217d6cd85d022 (patch)
tree69b094107551791f8b7d517815b1a03ebbb4e943
parentab6bd8b17f8c7a64d2a799d325dbf873fbb9378c (diff)
[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.
-rw-r--r--meson.build42
1 files 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')