Unify httpd.cpp from Nageru and Futatabi (whitespace differences, and metrics support).

[nageru] / futatabi / meson.build

diff --git a/futatabi/meson.build b/futatabi/meson.build
index 3f82d8d72bf7dad74566669e828716a6129ac882..aa58291db76d66ec2e67a7d85ffda9e93a8b6dc9 100644 (file)
--- a/futatabi/meson.build
+++ b/futatabi/meson.build
@@ -6,7 +6,6 @@ libavcodecdep = dependency('libavcodec')
 libavformatdep = dependency('libavformat')
 libavutildep = dependency('libavutil')
 libjpegdep = dependency('libjpeg')
-libmicrohttpddep = dependency('libmicrohttpd')
 libswscaledep = dependency('libswscale')
 movitdep = dependency('movit')
 protobufdep = dependency('protobuf')
@@ -34,7 +33,7 @@ moc_files = qt5.preprocess(
 srcs = ['flow.cpp', 'gpu_timers.cpp']
 
 # All the other files.
-srcs += ['main.cpp', 'player.cpp', 'httpd.cpp', 'video_stream.cpp', 'chroma_subsampler.cpp']
+srcs += ['main.cpp', 'player.cpp', 'video_stream.cpp', 'chroma_subsampler.cpp']
 srcs += ['vaapi_jpeg_decoder.cpp', 'db.cpp', 'disk_space_estimator.cpp', 'ycbcr_converter.cpp', 'flags.cpp']
 srcs += ['mainwindow.cpp', 'jpeg_frame_view.cpp', 'clip_list.cpp', 'frame_on_disk.cpp']
 srcs += moc_files