X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=shared%2Fmeson.build;h=c7ef06c410ea32464c91ecb21f45d24c268499b3;hb=adc0df09f7a9dc88a3c0dbad47a21a805e728862;hp=90711c02f1f17a8043e2be55fbcab61479894951;hpb=d1e616378bda406c96acf7c2dc975b7ab2e8165e;p=nageru

diff --git a/shared/meson.build b/shared/meson.build
index 90711c0..c7ef06c 100644
--- a/shared/meson.build
+++ b/shared/meson.build
@@ -3,25 +3,36 @@ shared_qt5deps = dependency('qt5', modules: ['Core', 'Gui', 'Widgets', 'OpenGL']
 libmicrohttpddep = dependency('libmicrohttpd')
 protobufdep = dependency('protobuf')
 alsadep = dependency('alsa')
+movitdep = dependency('movit')
 
 # Preprocess Qt as needed.
 qt_files = qt5.preprocess(
-	moc_headers: ['aboutdialog.h'],
+	moc_headers: ['aboutdialog.h', 'controller_spin_box.h'],
 	ui_files: ['aboutdialog.ui'],
 	dependencies: shared_qt5deps)
 
-srcs = ['memcpy_interleaved.cpp', 'metacube2.cpp', 'ffmpeg_raii.cpp', 'mux.cpp', 'metrics.cpp', 'context.cpp', 'httpd.cpp', 'disk_space_estimator.cpp', 'read_file.cpp', 'text_proto.cpp', 'midi_device.cpp']
+# Protobuf compilation.
+gen = generator(protoc, \
+        output    : ['@BASENAME@.pb.cc', '@BASENAME@.pb.h'],
+        arguments : ['--proto_path=@CURRENT_SOURCE_DIR@', '--cpp_out=@BUILD_DIR@', '@INPUT@'])
+proto_generated = gen.process(['midi_mapping.proto'])
+protobuf_lib = static_library('protobufs', proto_generated, dependencies: [protobufdep])
+protobuf_hdrs = declare_dependency(sources: proto_generated)
+
+srcs = ['memcpy_interleaved.cpp', 'metacube2.cpp', 'ffmpeg_raii.cpp', 'mux.cpp', 'metrics.cpp', 'context.cpp', 'httpd.cpp', 'disk_space_estimator.cpp', 'read_file.cpp', 'text_proto.cpp', 'midi_device.cpp', 'ref_counted_texture.cpp']
+srcs += proto_generated
 
 # Qt objects.
 srcs += qt_files
 srcs += ['aboutdialog.cpp']
 
-shared = static_library('shared', srcs, include_directories: top_include, dependencies: [shared_qt5deps, libmicrohttpddep, protobufdep, alsadep])
+shared = static_library('shared', srcs, include_directories: top_include, dependencies: [shared_qt5deps, libmicrohttpddep, protobufdep, alsadep, movitdep])
 shareddep = declare_dependency(
+   sources: proto_generated,
    include_directories: top_include,
-   link_with: shared)
+   link_with: [shared, protobuf_lib])
 
-bin2h = executable('bin2h', 'bin2h.cpp')
+bin2h = executable('bin2h', 'bin2h.cpp', native: true)
 bin2h_gen = generator(bin2h, \
   output    : ['@PLAINNAME@.cpp'],
   arguments : ['@INPUT@', '@PLAINNAME@', '@OUTPUT@'])