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

[nageru] / shared / meson.build

diff --git a/shared/meson.build b/shared/meson.build
index 09bf99027fa63a6c31aecd0a52e739289e8097ed..1bb183b9a2e8107dc0753091421a269637b077c3 100644 (file)
--- a/shared/meson.build
+++ b/shared/meson.build
@@ -1,7 +1,9 @@
+qt5 = import('qt5')
+qt5deps = dependency('qt5', modules: ['OpenGL'])
+libmicrohttpddep = dependency('libmicrohttpd')
 
-srcs = ['memcpy_interleaved.cpp', 'metacube2.cpp', 'ffmpeg_raii.cpp']
-shared = static_library('shared', srcs, include_directories: top_include)
+srcs = ['memcpy_interleaved.cpp', 'metacube2.cpp', 'ffmpeg_raii.cpp', 'mux.cpp', 'metrics.cpp', 'context.cpp', 'httpd.cpp']
+shared = static_library('shared', srcs, include_directories: top_include, dependencies: [qt5deps, libmicrohttpddep])
 shareddep = declare_dependency(
    include_directories: top_include,
-   link_with: shared,
-   sources: srcs)
+   link_with: shared)