X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=meson.build;h=cf7301c14f14519a7c695cc014435339743c7965;hb=refs%2Fheads%2Fcef-kaeru;hp=8f636ad16776fc879371d046b5780ecc00664a2c;hpb=79a6263d2208acebff58b672586e07eae0d29ea6;p=nageru

diff --git a/meson.build b/meson.build
index 8f636ad..cf7301c 100644
--- a/meson.build
+++ b/meson.build
@@ -1,4 +1,6 @@
-project('nageru', 'cpp', default_options: ['buildtype=debugoptimized'], version: '2.3.0')
+project('nageru', 'cpp', default_options: ['buildtype=debugoptimized'], version: '2.3.1-pre')
+
+add_project_arguments('-Wno-unqualified-std-cast-call', language: 'cpp')
 
 cxx = meson.get_compiler('cpp')
 qt5 = import('qt5')
@@ -83,6 +85,7 @@ nageru_link_with = []
 nageru_build_rpath = ''
 nageru_install_rpath = ''
 
+kaeru_srcs = ['nageru/kaeru.cpp']
 kaeru_link_with = []
 kaeru_extra_deps = []
 
@@ -120,13 +123,10 @@ if have_cef
 
 		cef_dll_target = custom_target('libcef_dll_wrapper',
 			input: join_paths(cef_dir, 'libcef_dll/CMakeLists.txt'),
-			output: ['libcef_dll_wrapper.a', 'cef-stamp'],
+			output: ['libcef_dll_wrapper.a'],
 			command: [cef_compile_script, '@BUILD_DIR@', cef_dir, cmake, '@OUTPUT@'])
 
-		# Putting the .a in sources seemingly hits a bug where the .a files get sorted
-		# in the wrong order. This is a workaround; see
-		# https://github.com/mesonbuild/meson/issues/3613#issuecomment-408276296 .
-		cefdlldep = declare_dependency(sources: cef_dll_target[1], link_args: cef_dll_target.full_path())
+		cefdlldep = declare_dependency(link_with: cef_dll_target)
 		nageru_deps += cefdlldep
 	endif
 
@@ -237,6 +237,7 @@ nageru_include_dirs += decklink_dir
 # CEF input.
 if have_cef
 	nageru_srcs += ['nageru/nageru_cef_app.cpp', 'nageru/cef_capture.cpp']
+	kaeru_srcs += ['nageru/cef_encoder_adapter.cpp', 'nageru/nageru_cef_app.cpp', 'nageru/cef_capture.cpp']
 endif
 
 nageru_srcs += qt_files
@@ -271,7 +272,7 @@ executable('nageru', 'nageru/main.cpp',
 meson.add_install_script('nageru/scripts/setup_nageru_symlink.sh')
 
 # Kaeru executable.
-executable('kaeru', 'nageru/kaeru.cpp',
+executable('kaeru', kaeru_srcs,
 	dependencies: [nageru_deps, kaeru_extra_deps],
 	include_directories: nageru_include_dirs,
 	link_with: [stream, aux, kaeru_link_with],