Mark a TODO.

[nageru] / meson.build

diff --git a/meson.build b/meson.build
index ac82c3ea1a1fb2d8f0f78fdecd166f4af28cc921..49f38b1a680539853fc94a7a7c226aaecd61560b 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1,4 +1,4 @@
-project('nageru', 'cpp', default_options: ['buildtype=debugoptimized'], version: '1.8.1')
+project('nageru', 'cpp', default_options: ['buildtype=debugoptimized'], version: '1.8.2')
 
 cxx = meson.get_compiler('cpp')
 qt5 = import('qt5')
@@ -257,7 +257,7 @@ executable('kaeru', 'nageru/kaeru.cpp',
 executable('benchmark_audio_mixer', 'nageru/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 = ['nageru/theme.lua', 'nageru/simple.lua', 'nageru/bg.jpeg', 'nageru/akai_midimix.midimapping']
+data_files = ['nageru/theme.lua', 'nageru/simple.lua', 'nageru/bg.jpeg', 'nageru/akai_midimix.midimapping', 'futatabi/behringer_cmd_pl1.midimapping']
 install_data(data_files, install_dir: join_paths(get_option('prefix'), 'share/nageru'))
 foreach file : data_files
        run_command('ln', '-s', join_paths(meson.current_source_dir(), file), meson.current_build_dir())
@@ -273,8 +273,9 @@ proto_generated = gen.process('futatabi/state.proto', 'futatabi/frame.proto', 'f
 
 # Preprocess Qt as needed.
 moc_files = qt5.preprocess(
-       moc_headers: ['futatabi/mainwindow.h', 'futatabi/jpeg_frame_view.h', 'futatabi/clip_list.h'],
-       ui_files: ['futatabi/mainwindow.ui'],
+       moc_headers: ['futatabi/mainwindow.h', 'futatabi/jpeg_frame_view.h', 'futatabi/clip_list.h', 'futatabi/midi_mapping_dialog.h'],
+       ui_files: ['futatabi/mainwindow.ui', 'futatabi/midi_mapping.ui'],
+       qresources: ['futatabi/mainwindow.qrc'],
        dependencies: qt5deps)
 
 # Flow objects.
@@ -284,7 +285,7 @@ futatabi_srcs = ['futatabi/flow.cpp', 'futatabi/gpu_timers.cpp']
 futatabi_srcs += ['futatabi/main.cpp', 'futatabi/player.cpp', 'futatabi/video_stream.cpp', 'futatabi/chroma_subsampler.cpp']
 futatabi_srcs += ['futatabi/vaapi_jpeg_decoder.cpp', 'futatabi/db.cpp', 'futatabi/ycbcr_converter.cpp', 'futatabi/flags.cpp']
 futatabi_srcs += ['futatabi/mainwindow.cpp', 'futatabi/jpeg_frame_view.cpp', 'futatabi/clip_list.cpp', 'futatabi/frame_on_disk.cpp']
-futatabi_srcs += ['futatabi/export.cpp', 'futatabi/midi_mapper.cpp']
+futatabi_srcs += ['futatabi/export.cpp', 'futatabi/midi_mapper.cpp', 'futatabi/midi_mapping_dialog.cpp']
 futatabi_srcs += moc_files
 futatabi_srcs += proto_generated