From 664783b290f2f5b99a741f5fc1a2755c3e8ebf43 Mon Sep 17 00:00:00 2001 From: WinterSnowfall Date: Sun, 10 Nov 2024 22:31:49 +0200 Subject: [PATCH] [build] Use the static version of the run-time library for MSVC builds --- README.md | 2 +- meson.build | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 2be8cfa5..f305be2d 100644 --- a/README.md +++ b/README.md @@ -122,7 +122,7 @@ git clone --recursive https://github.com/doitsujin/dxvk.git ### Requirements: - [wine 7.1](https://www.winehq.org/) or newer -- [Meson](https://mesonbuild.com/) build system (at least version 0.49) +- [Meson](https://mesonbuild.com/) build system (at least version 0.58) - [Mingw-w64](https://www.mingw-w64.org) compiler and headers (at least version 10.0) - [glslang](https://github.com/KhronosGroup/glslang) compiler diff --git a/meson.build b/meson.build index a9d8efb7..ecf7e4da 100644 --- a/meson.build +++ b/meson.build @@ -1,4 +1,4 @@ -project('dxvk', ['c', 'cpp'], version : 'v2.4.1', meson_version : '>= 0.58', default_options : [ 'cpp_std=c++17', 'warning_level=2' ]) +project('dxvk', ['c', 'cpp'], version : 'v2.4.1', meson_version : '>= 0.58', default_options : [ 'cpp_std=c++17', 'b_vscrt=static_from_buildtype', 'warning_level=2' ]) pkg = import('pkgconfig') cpu_family = target_machine.cpu_family() @@ -90,8 +90,8 @@ if platform == 'windows' # setup file alignment + enable PDB output for MSVC builds # PDBs are useful for Windows consumers of DXVK compiler_args += [ - '/Z7' - ] + '/Z7' + ] link_args += [ '/FILEALIGN:4096', '/DEBUG:FULL'