Make duplicated rows show up after the old ones, and also give them new IDs.

[nageru] / meson.build

diff --git a/meson.build b/meson.build
index 16a604e60ebc7908852af15f8284d60637e1a1a9..2ee9fb6cae6f932e3e693e81e76371f98e7f6592 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -41,20 +41,12 @@ 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')
 
-# DeckLink has these issues, and we include it from various places.
-if cxx.has_argument('-Wno-non-virtual-dtor')
-       add_project_arguments('-Wno-non-virtual-dtor', language: 'cpp')
-endif
-
 # This needs to be done before declaring any build targets.
 if get_option('cef_dir') != ''
        add_project_arguments('-DHAVE_CEF=1', language: 'cpp')
@@ -151,10 +143,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
@@ -211,9 +203,11 @@ stream = static_library('stream', stream_srcs, dependencies: nageru_deps, includ
 nageru_link_with += stream
 
 # DeckLink.
-nageru_srcs += ['nageru/decklink_capture.cpp', 'nageru/decklink_util.cpp', 'nageru/decklink_output.cpp',
-       'nageru/decklink/DeckLinkAPIDispatch.cpp']
-decklink_dir = include_directories('nageru/decklink')
+decklink_dir = include_directories('nageru/decklink', is_system: true)
+decklink_lib = static_library('decklink', 'nageru/decklink/DeckLinkAPIDispatch.cpp', include_directories: decklink_dir, cpp_args: '-w')
+nageru_link_with += decklink_lib
+
+nageru_srcs += ['nageru/decklink_capture.cpp', 'nageru/decklink_util.cpp', 'nageru/decklink_output.cpp']
 nageru_include_dirs += decklink_dir
 
 # CEF input.