X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=meson.build;h=461c12559dc58dcfeb942203eda8b90d0d45319d;hb=d1e616378bda406c96acf7c2dc975b7ab2e8165e;hp=7214f27b24dc4ee0a2440d00bffda706e6c6482c;hpb=1c8c62666642be6b4ffd397c13e66f4cbaf5e38c;p=nageru

diff --git a/meson.build b/meson.build
index 7214f27..461c125 100644
--- a/meson.build
+++ b/meson.build
@@ -1,4 +1,4 @@
-project('nageru', 'cpp', default_options: ['buildtype=debugoptimized'], version: '1.8.0')
+project('nageru', 'cpp', default_options: ['buildtype=debugoptimized'], version: '1.8.1')
 
 cxx = meson.get_compiler('cpp')
 qt5 = import('qt5')
@@ -47,11 +47,6 @@ add_project_arguments('-DMOVIT_SHADER_DIR="' + movit_shader_dir + '"', language:
 # 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')
@@ -148,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
@@ -208,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.