X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=meson.build;h=2a594c7d4f88c070bb315eacfd2613146a2958b7;hb=0a3ea4312599886108fbd12e389ed3504c4dae60;hp=16a604e60ebc7908852af15f8284d60637e1a1a9;hpb=1bd72e916cfd0afc2df6a9f61535ccf77090d0b4;p=nageru

diff --git a/meson.build b/meson.build
index 16a604e..2a594c7 100644
--- a/meson.build
+++ b/meson.build
@@ -41,11 +41,8 @@ if cxx.links(code, args: '-fuse-ld=lld', name: 'check for LLD')
 endif
 
 # Add the right MOVIT_SHADER_DIR definition.
-r = run_command('pkg-config', '--variable=shaderdir', 'movit')
-if r.returncode() != 0
-	error('Movit pkg-config installation is broken.')
-endif
-add_project_arguments('-DMOVIT_SHADER_DIR="' + r.stdout().strip() + '"', language: 'cpp')
+movit_shader_dir = movitdep.get_pkgconfig_variable('shaderdir')
+add_project_arguments('-DMOVIT_SHADER_DIR="' + movit_shader_dir + '"', language: 'cpp')
 
 # Make the Nageru version available as a #define.
 add_project_arguments('-DNAGERU_VERSION="' + meson.project_version() + '"', language: 'cpp')
@@ -151,10 +148,10 @@ endif
 
 # bmusb.
 if embedded_bmusb
-	bmusb_dir = include_directories('bmusb')
+	bmusb_dir = include_directories('nageru/bmusb')
 	nageru_include_dirs += bmusb_dir
 
-	bmusb = static_library('bmusb', 'bmusb/bmusb.cpp', 'bmusb/fake_capture.cpp',
+	bmusb = static_library('bmusb', 'nageru/bmusb/bmusb.cpp', 'nageru/bmusb/fake_capture.cpp',
 		dependencies: [libusbdep],
 		include_directories: [bmusb_dir])
 	nageru_link_with += bmusb