From 25b40c5df8b6ed895c216144893b002f66b5fc4e Mon Sep 17 00:00:00 2001 From: Joshua Ashton Date: Mon, 29 Jun 2020 15:43:05 +0100 Subject: [PATCH] build: Only find demo dependencies if building demos Signed-off-by: Joshua Ashton --- meson.build | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index 45f68a23..de768465 100644 --- a/meson.build +++ b/meson.build @@ -34,10 +34,6 @@ threads_dep = dependency('threads') vkd3d_platform = target_machine.system() if vkd3d_platform == 'linux' lib_dl = vkd3d_compiler.find_library('dl') - # For the demos... - lib_m = vkd3d_compiler.find_library('m') - lib_xcb = vkd3d_compiler.find_library('xcb') - lib_xcbkeysyms = vkd3d_compiler.find_library('xcb-keysyms') vkd3d_extra_libs = [ lib_dl, threads_dep ] elif vkd3d_platform == 'windows' lib_dxgi = vkd3d_compiler.find_library('dxgi') @@ -73,6 +69,10 @@ if enable_tests endif if enable_extras + lib_m = vkd3d_compiler.find_library('m') + lib_xcb = vkd3d_compiler.find_library('xcb') + lib_xcbkeysyms = vkd3d_compiler.find_library('xcb-keysyms') + if not lib_d3d12.found() lib_d3d12 = vkd3d_utils_dep warning('No d3d12 lib, falling back to vkd3d_utils for extras...')