X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fmeson.build;h=1fb60e674f591bee7afc8af97103d48133a55f6b;hb=4a38970b4e8cd4bce1dd9eabd56a45635501bbc3;hp=bc93a2839c35992353665a9c54e9cccf636316e8;hpb=392f9d1ccb835c05a3874c4bea163788b2c37024;p=nageru

diff --git a/nageru/meson.build b/nageru/meson.build
index bc93a28..1fb60e6 100644
--- a/nageru/meson.build
+++ b/nageru/meson.build
@@ -2,15 +2,6 @@ qt5 = import('qt5')
 protoc = find_program('protoc')
 cxx = meson.get_compiler('cpp')
 
-# Use lld if we can; it links a lot faster than ld.bfd or gold.
-nageru_link_args = []
-code = '''#include <stdio.h>
-int main() { printf("Hello, world!\n"); return 0; }
-'''
-if cxx.links(code, args: '-fuse-ld=lld', name: 'check for LLD')
-	nageru_link_args += '-fuse-ld=lld'
-endif
-
 embedded_bmusb = get_option('embedded_bmusb')
 
 alsadep = dependency('alsa')
@@ -38,7 +29,7 @@ x264dep = dependency('x264')
 zitaresamplerdep = cxx.find_library('zita-resampler')
 
 srcs = []
-nageru_deps = [qt5deps, libjpegdep, movitdep, libmicrohttpddep, protobufdep,
+nageru_deps = [shareddep, qt5deps, libjpegdep, movitdep, libmicrohttpddep, protobufdep,
 	vax11dep, vadrmdep, x11dep, libavformatdep, libavresampledep, libavcodecdep, libavutildep,
 	libswscaledep, libusbdep, luajitdep, dldep, x264dep, alsadep, zitaresamplerdep,
 	qcustomplotdep, threaddep]
@@ -50,24 +41,6 @@ nageru_install_rpath = ''
 kaeru_link_with = []
 kaeru_extra_deps = []
 
-# DeckLink has these issues, and we include it from various places.
-if cxx.has_argument('-Wno-non-virtual-dtor')
-	add_project_arguments('-Wno-non-virtual-dtor', language: 'cpp')
-endif
-
-# FFmpeg has a lot of deprecated APIs whose replacements are not available
-# in Debian stable, so we suppress these warnings.
-if cxx.has_argument('-Wno-deprecated-declarations')
-	add_project_arguments('-Wno-deprecated-declarations', language: 'cpp')
-endif
-
-# Add the right MOVIT_SHADER_DIR definition.
-r = run_command('pkg-config', '--variable=shaderdir', 'movit')
-if r.returncode() != 0
-	error('Movit pkg-config installation is broken.')
-endif
-add_project_arguments('-DMOVIT_SHADER_DIR="' + r.stdout().strip() + '"', language: 'cpp')
-
 # CEF.
 exe_dir = join_paths(get_option('prefix'), 'lib/nageru')
 cef_dir = get_option('cef_dir')
@@ -176,7 +149,7 @@ srcs += ['glwidget.cpp', 'mainwindow.cpp', 'vumeter.cpp', 'lrameter.cpp', 'compr
 	'nonlinear_fader.cpp', 'context_menus.cpp', 'vu_common.cpp', 'piecewise_interpolator.cpp', 'midi_mapper.cpp']
 
 # Auxiliary objects used for nearly everything.
-aux_srcs = ['metrics.cpp', 'flags.cpp']
+aux_srcs = ['flags.cpp']
 aux = static_library('aux', aux_srcs, dependencies: nageru_deps, include_directories: nageru_include_dirs)
 nageru_link_with += aux
 
@@ -188,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',
+	'theme.cpp', 'image_input.cpp', 'alsa_output.cpp',
 	'disk_space_estimator.cpp', 'timecode_renderer.cpp', 'tweaked_inputs.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',
-	'metacube2.cpp', 'mux.cpp', 'audio_encoder.cpp', 'ffmpeg_raii.cpp', 'ffmpeg_util.cpp', 'httpd.cpp', 'ffmpeg_capture.cpp',
+	'audio_encoder.cpp', 'ffmpeg_util.cpp', 'httpd.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
@@ -224,7 +197,6 @@ executable('nageru', 'main.cpp',
 	dependencies: nageru_deps,
 	include_directories: nageru_include_dirs,
 	link_with: nageru_link_with,
-	link_args: nageru_link_args,
 	build_rpath: nageru_build_rpath,
 	install_rpath: nageru_install_rpath,
 	install: true,
@@ -237,11 +209,10 @@ executable('kaeru', 'kaeru.cpp',
 	dependencies: [nageru_deps, kaeru_extra_deps],
 	include_directories: nageru_include_dirs,
 	link_with: [stream, aux, kaeru_link_with],
-	link_args: nageru_link_args,
 	install: true)
 
 # Audio mixer microbenchmark.
-executable('benchmark_audio_mixer', 'benchmark_audio_mixer.cpp', dependencies: nageru_deps, include_directories: nageru_include_dirs, link_args: nageru_link_args, link_with: [audio, aux])
+executable('benchmark_audio_mixer', 'benchmark_audio_mixer.cpp', dependencies: nageru_deps, include_directories: nageru_include_dirs, link_with: [audio, aux])
 
 # These are needed for a default run.
 data_files = ['theme.lua', 'simple.lua', 'bg.jpeg', 'akai_midimix.midimapping']