X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fmeson.build;h=6d31a4d556d4be2e9d3d4e4d1bfd6c05df2e590d;hb=44606be7327eb9160b9de6c7be5c5006a3d5670e;hp=3c74a79c890820086bfd9de5ac9a6cb8c425fc7f;hpb=ebd973909f6985622c1e77753291f84919f5fdf5;p=nageru

diff --git a/nageru/meson.build b/nageru/meson.build
index 3c74a79..6d31a4d 100644
--- a/nageru/meson.build
+++ b/nageru/meson.build
@@ -46,7 +46,8 @@ cef_dir = get_option('cef_dir')
 cef_build_type = get_option('cef_build_type')
 have_cef = (cef_dir != '')
 if have_cef
-	add_project_arguments('-DHAVE_CEF=1', language: 'cpp')
+	# This is done in the top-level file; just kept here for reference.
+	# add_project_arguments('-DHAVE_CEF=1', language: 'cpp')
 
 	system_cef = (cef_build_type == 'system')
 	if system_cef
@@ -135,16 +136,16 @@ nageru_link_with += protobuf_lib
 
 # Preprocess Qt as needed.
 qt_files = qt5.preprocess(
-	moc_headers: ['aboutdialog.h', 'analyzer.h', 'clickable_label.h', 'compression_reduction_meter.h', 'correlation_meter.h',
+	moc_headers: ['analyzer.h', 'clickable_label.h', 'compression_reduction_meter.h', 'correlation_meter.h',
 		'ellipsis_label.h', 'glwidget.h', 'input_mapping_dialog.h', 'lrameter.h', 'mainwindow.h', 'midi_mapping_dialog.h',
 		'nonlinear_fader.h', 'vumeter.h'],
-	ui_files: ['aboutdialog.ui', 'analyzer.ui', 'audio_expanded_view.ui', 'audio_miniview.ui', 'display.ui',
+	ui_files: ['analyzer.ui', 'audio_expanded_view.ui', 'audio_miniview.ui', 'display.ui',
 		'input_mapping.ui', 'mainwindow.ui', 'midi_mapping.ui'],
 	dependencies: qt5deps)
 
 # Qt objects.
 srcs += ['glwidget.cpp', 'mainwindow.cpp', 'vumeter.cpp', 'lrameter.cpp', 'compression_reduction_meter.cpp',
-	'correlation_meter.cpp', 'aboutdialog.cpp', 'analyzer.cpp', 'input_mapping_dialog.cpp', 'midi_mapping_dialog.cpp',
+	'correlation_meter.cpp', 'analyzer.cpp', 'input_mapping_dialog.cpp', 'midi_mapping_dialog.cpp',
 	'nonlinear_fader.cpp', 'context_menus.cpp', 'vu_common.cpp', 'piecewise_interpolator.cpp', 'midi_mapper.cpp']
 
 # Auxiliary objects used for nearly everything.
@@ -161,7 +162,7 @@ nageru_link_with += audio
 # Mixer objects.
 srcs += ['chroma_subsampler.cpp', 'v210_converter.cpp', 'mixer.cpp', 'pbo_frame_allocator.cpp',
 	'theme.cpp', 'image_input.cpp', 'alsa_output.cpp',
-	'timecode_renderer.cpp', 'tweaked_inputs.cpp']
+	'timecode_renderer.cpp', 'tweaked_inputs.cpp', 'mjpeg_encoder.cpp']
 
 # Streaming and encoding objects (largely the set that is shared between Nageru and Kaeru).
 stream_srcs = ['quicksync_encoder.cpp', 'x264_encoder.cpp', 'x264_dynamic.cpp', 'x264_speed_control.cpp', 'video_encoder.cpp',