From 5a1b37b77078d902168e8b8ac2c0c3c23398edfe Mon Sep 17 00:00:00 2001 From: Philip Rebohle Date: Mon, 5 Nov 2018 07:55:36 +0100 Subject: [PATCH] [build] Don't use empty dependencies Fixes build error with Meson 0.44. --- meson.build | 4 ++-- src/dxvk/meson.build | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index ccf615356..f660a4504 100644 --- a/meson.build +++ b/meson.build @@ -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') diff --git a/src/dxvk/meson.build b/src/dxvk/meson.build index a25900df3..a55875e89 100644 --- a/src/dxvk/meson.build +++ b/src/dxvk/meson.build @@ -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])