From c79d073b675fe3f747bb6a890f85ab0521335445 Mon Sep 17 00:00:00 2001 From: Joshua Ashton Date: Wed, 24 Jun 2020 06:14:28 +0100 Subject: [PATCH] build: Fallback to vkd3d-utils if no d3d12 lib is present Signed-off-by: Joshua Ashton --- meson.build | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index c4bf223b..d1155c5c 100644 --- a/meson.build +++ b/meson.build @@ -34,7 +34,7 @@ if vkd3d_platform == 'linux' vkd3d_extra_libs = [ lib_dl, threads_dep ] elif vkd3d_platform == 'windows' lib_dxgi = vkd3d_compiler.find_library('dxgi') - lib_d3d12 = vkd3d_compiler.find_library('d3d12') + lib_d3d12 = vkd3d_compiler.find_library('d3d12', required : false) vkd3d_extra_libs = [ threads_dep ] else error('Unknown platform') @@ -75,6 +75,11 @@ if enable_tests endif if enable_extras + if not lib_d3d12.found() + lib_d3d12 = vkd3d_utils_dep + warning('No d3d12 lib, falling back to vkd3d_utils for extras...') + endif + subdir('demos') subdir('programs') endif \ No newline at end of file