From e7b71926e351685c4f960e1dc538dd37fbe3ba66 Mon Sep 17 00:00:00 2001 From: Jacek Caban Date: Mon, 26 Aug 2019 15:33:35 +0200 Subject: [PATCH] [build] Check if --add-stdcall-alias and --enable-stdcall-fixup is supported before using it. lld-link linker does not support nor need it. --- build-win32.txt | 2 +- meson.build | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/build-win32.txt b/build-win32.txt index 0865fc5e..97ec8a35 100644 --- a/build-win32.txt +++ b/build-win32.txt @@ -8,7 +8,7 @@ strip = 'i686-w64-mingw32-strip' c_args=['-msse', '-msse2'] cpp_args=['-msse', '-msse2'] c_link_args = ['-static', '-static-libgcc'] -cpp_link_args = ['-static', '-static-libgcc', '-static-libstdc++', '-Wl,--add-stdcall-alias,--enable-stdcall-fixup'] +cpp_link_args = ['-static', '-static-libgcc', '-static-libstdc++'] needs_exe_wrapper = true [host_machine] diff --git a/meson.build b/meson.build index 49535bdc..d1a66fa4 100644 --- a/meson.build +++ b/meson.build @@ -1,4 +1,4 @@ -project('dxvk', ['c', 'cpp'], version : 'v1.3.2', meson_version : '>= 0.43') +project('dxvk', ['c', 'cpp'], version : 'v1.3.2', meson_version : '>= 0.46') cpu_family = target_machine.cpu_family() @@ -50,6 +50,14 @@ else else wrc = cpu_family == 'x86_64' ? find_program('x86_64-w64-mingw32-windres') : find_program('i686-w64-mingw32-windres') endif + if cpu_family == 'x86' + if dxvk_compiler.has_link_argument('-Wl,--add-stdcall-alias') + add_global_link_arguments('-Wl,--add-stdcall-alias', language: 'cpp') + endif + if dxvk_compiler.has_link_argument('-Wl,--enable-stdcall-fixup') + add_global_link_arguments('-Wl,--enable-stdcall-fixup', language: 'cpp') + endif + endif lib_vulkan = dxvk_compiler.find_library('vulkan-1', dirs : dxvk_library_path) lib_d3d11 = dxvk_compiler.find_library('d3d11')