X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=futatabi%2Fmeson.build;h=d9ec0c3d6868849281e864d903096b08948f3a8c;hb=b563b8903fa84bb7fd62d7d0b84b70cb26843dbf;hp=a9c95b4064f62ee886edae3fd0c17d2cc774f784;hpb=6e116a6bbeb2c047a3bfb084395ec601ce211e6c;p=nageru

diff --git a/futatabi/meson.build b/futatabi/meson.build
index a9c95b4..d9ec0c3 100644
--- a/futatabi/meson.build
+++ b/futatabi/meson.build
@@ -18,13 +18,6 @@ vadrmdep = dependency('libva-drm')
 vax11dep = dependency('libva-x11')
 x11dep = dependency('x11')
 
-# 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_global_arguments('-DMOVIT_SHADER_DIR="' + r.stdout().strip() + '"', language: 'cpp')
-
 # Protobuf compilation.
 gen = generator(protoc, \
   output    : ['@BASENAME@.pb.cc', '@BASENAME@.pb.h'],
@@ -41,8 +34,8 @@ moc_files = qt5.preprocess(
 srcs = ['flow.cpp', 'gpu_timers.cpp']
 
 # All the other files.
-srcs += ['ffmpeg_raii.cpp', 'main.cpp', 'player.cpp', 'httpd.cpp', 'mux.cpp', 'metacube2.cpp', 'video_stream.cpp', 'context.cpp', 'chroma_subsampler.cpp']
-srcs += ['vaapi_jpeg_decoder.cpp', 'memcpy_interleaved.cpp', 'db.cpp', 'disk_space_estimator.cpp', 'ycbcr_converter.cpp', 'flags.cpp']
+srcs += ['main.cpp', 'player.cpp', 'httpd.cpp', 'mux.cpp', 'video_stream.cpp', 'context.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
 srcs += proto_generated
@@ -64,7 +57,7 @@ bin2h_gen = generator(bin2h, \
 shader_srcs = bin2h_gen.process(shaders)
 srcs += shader_srcs
 
-executable('futatabi', srcs, dependencies: [qt5deps, libjpegdep, movitdep, libmicrohttpddep, protobufdep, sqlite3dep, vax11dep, vadrmdep, x11dep, libavformatdep, libavcodecdep, libavutildep, libswscaledep])
+executable('futatabi', srcs, dependencies: [shareddep, qt5deps, libjpegdep, movitdep, libmicrohttpddep, protobufdep, sqlite3dep, vax11dep, vadrmdep, x11dep, libavformatdep, libavcodecdep, libavutildep, libswscaledep], link_with: shared)
 executable('flow', 'flow_main.cpp', 'flow.cpp', 'gpu_timers.cpp', shader_srcs, dependencies: [epoxydep, sdl2dep, sdl2_imagedep])
 executable('eval', 'eval.cpp', 'util.cpp')
 executable('vis', 'vis.cpp', 'util.cpp')