mirrors
/
dxvk
mirror of https://github.com/doitsujin/dxvk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[build] Check if --add-stdcall-alias and --enable-stdcall-fixup is supported before using it. 

lld-link linker does not support nor need it.
This commit is contained in:
Jacek Caban 2019-08-26 15:33:35 +02:00 committed by Philip Rebohle
parent 1981140257
commit e7b71926e3
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build-win32.txt
View File

@ -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]

10
meson.build
View File

@ -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')