X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fmeson.build;h=c66ea542ae16ce1f62e25c3822f05fbdde7188d3;hb=147a2d38463d983ec7c66ef5c4c9c6cce7d52787;hp=0c12be47d290d47d799ffb09b320f30140b58a69;hpb=131a051c4cd3719a9be415386fdf0f4e15da7c66;p=nageru

diff --git a/nageru/meson.build b/nageru/meson.build
index 0c12be4..c66ea54 100644
--- a/nageru/meson.build
+++ b/nageru/meson.build
@@ -13,7 +13,6 @@ libavformatdep = dependency('libavformat')
 libavresampledep = dependency('libavresample')
 libavutildep = dependency('libavutil')
 libjpegdep = dependency('libjpeg')
-libmicrohttpddep = dependency('libmicrohttpd')
 libswscaledep = dependency('libswscale')
 libusbdep = dependency('libusb-1.0')
 luajitdep = dependency('luajit')
@@ -29,7 +28,7 @@ x264dep = dependency('x264')
 zitaresamplerdep = cxx.find_library('zita-resampler')
 
 srcs = []
-nageru_deps = [shareddep, qt5deps, libjpegdep, movitdep, libmicrohttpddep, protobufdep,
+nageru_deps = [shareddep, qt5deps, libjpegdep, movitdep, protobufdep,
 	vax11dep, vadrmdep, x11dep, libavformatdep, libavresampledep, libavcodecdep, libavutildep,
 	libswscaledep, libusbdep, luajitdep, dldep, x264dep, alsadep, zitaresamplerdep,
 	qcustomplotdep, threaddep]
@@ -47,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
@@ -161,18 +161,18 @@ nageru_link_with += audio
 
 # Mixer objects.
 srcs += ['chroma_subsampler.cpp', 'v210_converter.cpp', 'mixer.cpp', 'pbo_frame_allocator.cpp',
-	'context.cpp', 'theme.cpp', 'image_input.cpp', 'alsa_output.cpp',
-	'disk_space_estimator.cpp', 'timecode_renderer.cpp', 'tweaked_inputs.cpp']
+	'theme.cpp', 'image_input.cpp', 'alsa_output.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',
-	'audio_encoder.cpp', 'ffmpeg_util.cpp', 'httpd.cpp', 'ffmpeg_capture.cpp',
+	'audio_encoder.cpp', 'ffmpeg_util.cpp', 'ffmpeg_capture.cpp',
 	'print_latency.cpp', 'basic_stats.cpp', 'ref_counted_frame.cpp']
 stream = static_library('stream', stream_srcs, dependencies: nageru_deps, include_directories: nageru_include_dirs)
 nageru_link_with += stream
 
 # DeckLink.
-srcs += ['decklink_capture.cpp', 'decklink_util.cpp', 'decklink_output.cpp', 'memcpy_interleaved.cpp',
+srcs += ['decklink_capture.cpp', 'decklink_util.cpp', 'decklink_output.cpp',
 	'decklink/DeckLinkAPIDispatch.cpp']
 decklink_dir = include_directories('decklink')
 nageru_include_dirs += decklink_dir
@@ -185,6 +185,15 @@ endif
 srcs += qt_files
 srcs += proto_generated
 
+# Shaders needed at runtime.
+shaders = ['cbcr_subsample.vert', 'cbcr_subsample.frag', 'uyvy_subsample.vert', 'uyvy_subsample.frag', 'v210_subsample.comp', 'timecode.vert', 'timecode.frag', 'timecode_10bit.frag']
+foreach shader : shaders
+  run_command('ln', '-s', join_paths(meson.current_source_dir(), shader), meson.current_build_dir())
+endforeach
+
+shader_srcs = bin2h_gen.process(shaders)
+srcs += shader_srcs
+
 # Everything except main.cpp. (We do this because if you specify a .cpp file in
 # both Nageru and Kaeru, it gets compiled twice. In the older Makefiles, Kaeru
 # depended on a smaller set of objects.)