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

[build] Don't use empty dependencies 

Fixes build error with Meson 0.44.
This commit is contained in:
Philip Rebohle 2018-11-05 07:55:36 +01:00
parent e0f1510901
commit 5a1b37b770
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meson.build
View File

@ -30,6 +30,7 @@ code = '''#ifndef __WINE__
#endif'''
dxvk_winelib = dxvk_compiler.compiles(code, name: 'winelib check')
dxvk_extradep = [ ]
if dxvk_winelib
lib_vulkan = declare_dependency(link_args: [ '-lwinevulkan' ])
@ -37,7 +38,7 @@ if dxvk_winelib
lib_dxgi = declare_dependency(link_args: [ '-ldxgi' ])
lib_d3dcompiler_43 = declare_dependency(link_args: [ '-L'+dxvk_library_path, '-ld3dcompiler_43' ])
lib_d3dcompiler_47 = declare_dependency(link_args: [ '-ld3dcompiler' ])
lib_dl = declare_dependency(link_args: [ '-ldl' ])
dxvk_extradep += [ declare_dependency(link_args: [ '-ldl' ]) ]
exe_ext = '.exe.so'
dll_ext = '.dll'
def_spec_ext = '.spec'
@ -46,7 +47,6 @@ else
lib_d3d11 = dxvk_compiler.find_library('d3d11')
lib_dxgi = dxvk_compiler.find_library('dxgi')
lib_d3dcompiler_43 = dxvk_compiler.find_library('d3dcompiler_43', dirs : dxvk_library_path)
lib_dl = dependency('', required : false)
if dxvk_compiler.get_id() == 'msvc'
lib_d3dcompiler_47 = dxvk_compiler.find_library('d3dcompiler')

2
src/dxvk/meson.build
View File

@ -102,7 +102,7 @@ thread_dep = dependency('threads')
dxvk_lib = static_library('dxvk', dxvk_src, glsl_generator.process(dxvk_shaders), dxvk_version,
link_with : [ util_lib, spirv_lib ],
dependencies : [ thread_dep, vkcommon_dep, lib_dl ],
dependencies : [ thread_dep, vkcommon_dep ] + dxvk_extradep,
include_directories : [ dxvk_include_path ],
override_options : ['cpp_std='+dxvk_cpp_std])