X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=meson.build;h=c66d4a7b5fe7cc9838e3081d682c52802d5bbd96;hb=f1a8ab7eb34a89a104093c3931b1d51fcb2684e6;hp=16a604e60ebc7908852af15f8284d60637e1a1a9;hpb=1bd72e916cfd0afc2df6a9f61535ccf77090d0b4;p=nageru diff --git a/meson.build b/meson.build index 16a604e..c66d4a7 100644 --- a/meson.build +++ b/meson.build @@ -1,4 +1,4 @@ -project('nageru', 'cpp', default_options: ['buildtype=debugoptimized'], version: '1.8.0') +project('nageru', 'cpp', default_options: ['buildtype=debugoptimized'], version: '1.8.1') cxx = meson.get_compiler('cpp') qt5 = import('qt5') @@ -41,20 +41,12 @@ if cxx.links(code, args: '-fuse-ld=lld', name: 'check for LLD') 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') +movit_shader_dir = movitdep.get_pkgconfig_variable('shaderdir') +add_project_arguments('-DMOVIT_SHADER_DIR="' + movit_shader_dir + '"', language: 'cpp') # Make the Nageru version available as a #define. add_project_arguments('-DNAGERU_VERSION="' + meson.project_version() + '"', language: 'cpp') -# 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 - # This needs to be done before declaring any build targets. if get_option('cef_dir') != '' add_project_arguments('-DHAVE_CEF=1', language: 'cpp') @@ -151,10 +143,10 @@ endif # bmusb. if embedded_bmusb - bmusb_dir = include_directories('bmusb') + bmusb_dir = include_directories('nageru/bmusb') nageru_include_dirs += bmusb_dir - bmusb = static_library('bmusb', 'bmusb/bmusb.cpp', 'bmusb/fake_capture.cpp', + bmusb = static_library('bmusb', 'nageru/bmusb/bmusb.cpp', 'nageru/bmusb/fake_capture.cpp', dependencies: [libusbdep], include_directories: [bmusb_dir]) nageru_link_with += bmusb @@ -167,9 +159,9 @@ endif # Protobuf compilation. gen = generator(protoc, \ output : ['@BASENAME@.pb.cc', '@BASENAME@.pb.h'], - arguments : ['--proto_path=@CURRENT_SOURCE_DIR@/nageru', '--cpp_out=@BUILD_DIR@', '@INPUT@']) -proto_generated = gen.process(['nageru/state.proto', 'nageru/midi_mapping.proto', 'nageru/json.proto']) -protobuf_lib = static_library('protobufs', proto_generated, dependencies: nageru_deps, include_directories: nageru_include_dirs) + arguments : ['--proto_path=@CURRENT_SOURCE_DIR@/nageru', '--cpp_out=@BUILD_DIR@', '-I@CURRENT_SOURCE_DIR@/shared', '@INPUT@']) +proto_generated = gen.process(['nageru/state.proto', 'nageru/json.proto', 'nageru/nageru_midi_mapping.proto']) +protobuf_lib = static_library('nageru_protobufs', proto_generated, dependencies: nageru_deps, include_directories: nageru_include_dirs) protobuf_hdrs = declare_dependency(sources: proto_generated) nageru_link_with += protobuf_lib @@ -177,7 +169,7 @@ nageru_link_with += protobuf_lib qt_files = qt5.preprocess( moc_headers: ['nageru/analyzer.h', 'nageru/clickable_label.h', 'nageru/compression_reduction_meter.h', 'nageru/correlation_meter.h', 'nageru/ellipsis_label.h', 'nageru/glwidget.h', 'nageru/input_mapping_dialog.h', 'nageru/lrameter.h', 'nageru/mainwindow.h', 'nageru/midi_mapping_dialog.h', - 'nageru/nonlinear_fader.h', 'nageru/vumeter.h'], + 'nageru/nonlinear_fader.h', 'nageru/vumeter.h', 'nageru/controller_spin_box.h'], ui_files: ['nageru/analyzer.ui', 'nageru/audio_expanded_view.ui', 'nageru/audio_miniview.ui', 'nageru/display.ui', 'nageru/input_mapping.ui', 'nageru/mainwindow.ui', 'nageru/midi_mapping.ui'], dependencies: qt5deps) @@ -211,9 +203,11 @@ stream = static_library('stream', stream_srcs, dependencies: nageru_deps, includ nageru_link_with += stream # DeckLink. -nageru_srcs += ['nageru/decklink_capture.cpp', 'nageru/decklink_util.cpp', 'nageru/decklink_output.cpp', - 'nageru/decklink/DeckLinkAPIDispatch.cpp'] -decklink_dir = include_directories('nageru/decklink') +decklink_dir = include_directories('nageru/decklink', is_system: true) +decklink_lib = static_library('decklink', 'nageru/decklink/DeckLinkAPIDispatch.cpp', include_directories: decklink_dir, cpp_args: '-w') +nageru_link_with += decklink_lib + +nageru_srcs += ['nageru/decklink_capture.cpp', 'nageru/decklink_util.cpp', 'nageru/decklink_output.cpp'] nageru_include_dirs += decklink_dir # CEF input. @@ -263,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()) @@ -274,13 +268,14 @@ endforeach # Protobuf compilation. gen = generator(protoc, \ output : ['@BASENAME@.pb.cc', '@BASENAME@.pb.h'], - arguments : ['--proto_path=@CURRENT_SOURCE_DIR@/futatabi', '--cpp_out=@BUILD_DIR@', '@INPUT@']) -proto_generated = gen.process('futatabi/state.proto', 'futatabi/frame.proto') + arguments : ['--proto_path=@CURRENT_SOURCE_DIR@/futatabi', '--cpp_out=@BUILD_DIR@', '-I@CURRENT_SOURCE_DIR@/shared', '@INPUT@']) +proto_generated = gen.process('futatabi/state.proto', 'futatabi/frame.proto', 'futatabi/futatabi_midi_mapping.proto') # 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'], + qresources: ['futatabi/mainwindow.qrc'], dependencies: qt5deps) # Flow objects. @@ -290,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_srcs += ['futatabi/export.cpp', 'futatabi/midi_mapper.cpp'] futatabi_srcs += moc_files futatabi_srcs += proto_generated