Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MSVC and clang-cl QoL improvements #3808

Merged
merged 3 commits into from
Jan 23, 2024
Merged

MSVC and clang-cl QoL improvements #3808

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e0941b4
[build] Recognize more MSVC-like compilers as MSVC
ishitatsuyuki Jan 19, 2024
f0ecf6d
[build] Don't pass unix compiler and link args to MSVC
ishitatsuyuki Jan 19, 2024
9ea6fda
[build] Set filealign for MSVC builds
ishitatsuyuki Jan 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 25 additions & 19 deletions meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ platform = target_machine.system()

cpp = meson.get_compiler('cpp')
cc = meson.get_compiler('c')
dxvk_is_msvc = cpp.get_id() == 'msvc'
dxvk_is_msvc = cpp.get_argument_syntax() == 'msvc'

compiler_args = [
'-msse',
Expand Down Expand Up @@ -48,27 +48,33 @@ 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',
if not dxvk_is_msvc
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',
]
endif

# Enable stdcall fixup on 32-bit
if cpu_family == 'x86'
# 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
else
link_args += [
'-Wl,--enable-stdcall-fixup',
'-Wl,--kill-at',
'/FILEALIGN:4096',
]
endif

Expand Down