X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=meson.build;h=ac82c3ea1a1fb2d8f0f78fdecd166f4af28cc921;hb=a6f3a2275ad116e6ab338e583ab8ef1b1141b468;hp=5b11adb4feb4ac05c73cde5e580cf48c400d35be;hpb=77b07753d623ff273cfd31abee45b9b6e258a142;p=nageru

diff --git a/meson.build b/meson.build
index 5b11adb..ac82c3e 100644
--- a/meson.build
+++ b/meson.build
@@ -1,4 +1,4 @@
-project('nageru', 'cpp', default_options: ['buildtype=debugoptimized'], version: '1.8.1-pre')
+project('nageru', 'cpp', default_options: ['buildtype=debugoptimized'], version: '1.8.1')
 
 cxx = meson.get_compiler('cpp')
 qt5 = import('qt5')
@@ -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
 
@@ -268,8 +268,8 @@ 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(
@@ -284,7 +284,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