X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=meson.build;h=9880137d11a7f47b36b916507dabd74e7ebf74b0;hb=0a338eed8f26adaf202e0cadc88b533ce9fa173d;hp=49f38b1a680539853fc94a7a7c226aaecd61560b;hpb=978b42bf2e535f40f73a1afec86789294f375c1e;p=nageru

diff --git a/meson.build b/meson.build
index 49f38b1..9880137 100644
--- a/meson.build
+++ b/meson.build
@@ -1,4 +1,4 @@
-project('nageru', 'cpp', default_options: ['buildtype=debugoptimized'], version: '1.8.2')
+project('nageru', 'cpp', default_options: ['buildtype=debugoptimized'], version: '1.9.1')
 
 cxx = meson.get_compiler('cpp')
 qt5 = import('qt5')
@@ -47,6 +47,9 @@ 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')
 
+# Make the prefix (e.g. /usr/local) available as a #define.
+add_project_arguments('-DPREFIX="' + get_option('prefix') + '"', language: 'cpp')
+
 # This needs to be done before declaring any build targets.
 if get_option('cef_dir') != ''
 	add_project_arguments('-DHAVE_CEF=1', language: 'cpp')
@@ -94,7 +97,7 @@ if have_cef
 		nageru_install_rpath = '$ORIGIN/'
 	endif
 
-	cefdep = cxx.find_library('cef')
+	cefdep = cxx.find_library('cef', dirs: cef_lib_dir)
 	nageru_deps += cefdep
 
 	# CEF wrapper library; not built as part of the CEF binary distribution,
@@ -104,7 +107,7 @@ if have_cef
 		nageru_deps += cefdlldep
 	else
 		cmake = find_program('cmake')
-		cef_compile_script = find_program('scripts/compile_cef_dll_wrapper.sh')
+		cef_compile_script = find_program('nageru/scripts/compile_cef_dll_wrapper.sh')
 
 		cef_dll_target = custom_target('libcef_dll_wrapper',
 			input: join_paths(cef_dir, 'libcef_dll/CMakeLists.txt'),
@@ -192,7 +195,7 @@ nageru_link_with += audio
 
 # Mixer objects.
 nageru_srcs += ['nageru/chroma_subsampler.cpp', 'nageru/v210_converter.cpp', 'nageru/mixer.cpp', 'nageru/pbo_frame_allocator.cpp',
-	'nageru/theme.cpp', 'nageru/image_input.cpp', 'nageru/alsa_output.cpp',
+	'nageru/theme.cpp', 'nageru/scene.cpp', 'nageru/image_input.cpp', 'nageru/alsa_output.cpp',
 	'nageru/timecode_renderer.cpp', 'nageru/tweaked_inputs.cpp', 'nageru/mjpeg_encoder.cpp']
 
 # Streaming and encoding objects (largely the set that is shared between Nageru and Kaeru).
@@ -303,7 +306,7 @@ futatabi_shader_srcs = bin2h_gen.process(shaders)
 futatabi_srcs += futatabi_shader_srcs
 
 executable('futatabi', futatabi_srcs,
-	dependencies: [shareddep, qt5deps, libjpegdep, movitdep, libmicrohttpddep, protobufdep, sqlite3dep, vax11dep, vadrmdep, x11dep, libavformatdep, libavcodecdep, libavutildep, libswscaledep],
+	dependencies: [shareddep, qt5deps, libjpegdep, movitdep, libmicrohttpddep, protobufdep, sqlite3dep, vax11dep, vadrmdep, x11dep, threaddep, libavformatdep, libavcodecdep, libavutildep, libswscaledep],
 	link_with: shared,
 	include_directories: [include_directories('futatabi')],
 	install: true)