rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-03-15 07:29:17 +01:00
Code Issues Projects Releases Wiki Activity

[buid] Support linking system DLLs in winelib builds

Browse Source 
find_library doesn't work when using winegcc. Specify linker command instead.
This commit is contained in:
Jacek Caban 2018-07-18 01:00:07 +02:00 committed by Philip Rebohle
parent f81de6bacf
commit 2fb0ccae7f
2 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
build-wine64.txt Normal file
View File

@ -0,0 +1,15 @@
[binaries]
c = 'winegcc'
cpp = 'wineg++'
ar = 'ar'
strip = 'strip'
[properties]
winelib = true
[host_machine]
system = 'linux'
cpu_family = 'x86_64'
cpu = 'x86_64'
endian = 'little'

16
meson.build
View File

@ -23,12 +23,18 @@ else
dxvk_library_path = meson.source_root() + '/lib32' dxvk_library_path = meson.source_root() + '/lib32'
endif endif
lib_vulkan = dxvk_compiler.find_library('vulkan-1', dirs : dxvk_library_path) if meson.get_cross_property('winelib', false)
lib_d3d11 = dxvk_compiler.find_library('d3d11') lib_vulkan = declare_dependency(link_args: [ '-lvulkan-1' ])
lib_dxgi = dxvk_compiler.find_library('dxgi') lib_d3d11 = declare_dependency(link_args: [ '-ld3d11' ])
lib_dxgi = declare_dependency(link_args: [ '-ldxgi' ])
if dxvk_compiler.get_id() != 'msvc' lib_d3dcompiler_47 = declare_dependency(link_args: [ '-ld3dcompiler_47' ])
else
lib_vulkan = dxvk_compiler.find_library('vulkan-1', dirs : dxvk_library_path)
lib_d3d11 = dxvk_compiler.find_library('d3d11')
lib_dxgi = dxvk_compiler.find_library('dxgi')
if dxvk_compiler.get_id() != 'msvc'
lib_d3dcompiler_47 = dxvk_compiler.find_library('d3dcompiler_47') lib_d3dcompiler_47 = dxvk_compiler.find_library('d3dcompiler_47')
endif
endif endif
glsl_compiler = find_program('glslangValidator') glsl_compiler = find_program('glslangValidator')