X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=meson.build;h=fa6d40f5967723352192b7579a90f26c1fc4ac47;hb=f22a41cb05c5cc1bbe8ce391fa918707138afad3;hp=a3e943004d5b367ebfd679f0c30efe321df3001e;hpb=4a90022f4e25a0189df638a9aba89238e6a9a4ce;p=nageru diff --git a/meson.build b/meson.build index a3e9430..fa6d40f 100644 --- a/meson.build +++ b/meson.build @@ -159,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 +177,7 @@ qt_files = qt5.preprocess( # Qt objects. nageru_srcs += ['nageru/glwidget.cpp', 'nageru/mainwindow.cpp', 'nageru/vumeter.cpp', 'nageru/lrameter.cpp', 'nageru/compression_reduction_meter.cpp', 'nageru/correlation_meter.cpp', 'nageru/analyzer.cpp', 'nageru/input_mapping_dialog.cpp', 'nageru/midi_mapping_dialog.cpp', - 'nageru/nonlinear_fader.cpp', 'nageru/context_menus.cpp', 'nageru/vu_common.cpp', 'nageru/piecewise_interpolator.cpp', 'nageru/midi_mapper.cpp', 'nageru/midi_device.cpp'] + 'nageru/nonlinear_fader.cpp', 'nageru/context_menus.cpp', 'nageru/vu_common.cpp', 'nageru/piecewise_interpolator.cpp', 'nageru/midi_mapper.cpp'] # Auxiliary objects used for nearly everything. aux_srcs = ['nageru/flags.cpp']