X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=meson.build;h=b23f6d9127d236eb63c9690e6eda03acc75f9bc5;hb=6cf87ad853439f8565c575fb29dc539a15fdba87;hp=24491e727a99b06f26b45e79e3f1fa48d93dca48;hpb=e8d8d4edbb4f7c945fe2f67c9209db41329b0d2c;p=nageru

diff --git a/meson.build b/meson.build
index 24491e7..b23f6d9 100644
--- a/meson.build
+++ b/meson.build
@@ -1,4 +1,4 @@
-project('nageru', 'cpp', default_options: ['buildtype=debugoptimized'], version: '1.8.6')
+project('nageru', 'cpp', default_options: ['buildtype=debugoptimized'], version: '1.9.1')
 
 cxx = meson.get_compiler('cpp')
 qt5 = import('qt5')
@@ -9,6 +9,7 @@ embedded_bmusb = get_option('embedded_bmusb')
 alsadep = dependency('alsa')
 bmusbdep = dependency('bmusb', required: not embedded_bmusb)
 dldep = cxx.find_library('dl')
+eigendep = dependency('eigen3')
 epoxydep = dependency('epoxy')
 libavcodecdep = dependency('libavcodec')
 libavformatdep = dependency('libavformat')
@@ -65,7 +66,7 @@ nageru_srcs = []
 nageru_deps = [shareddep, qt5deps, libjpegdep, movitdep, protobufdep,
 	vax11dep, vadrmdep, x11dep, libavformatdep, libswresampledep, libavcodecdep, libavutildep,
 	libswscaledep, libusbdep, luajitdep, dldep, x264dep, alsadep, zitaresamplerdep,
-	qcustomplotdep, threaddep]
+	qcustomplotdep, threaddep, eigendep]
 nageru_include_dirs = [include_directories('nageru')]
 nageru_link_with = []
 nageru_build_rpath = ''
@@ -195,7 +196,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).
@@ -306,7 +307,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)