X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=meson.build;h=404f0af3b46e856c273a0b274f2c9e4c2a527c1b;hb=refs%2Ftags%2F1.8.0;hp=fca2df94aab1639ae4f954cb2247cc791d8cf1ee;hpb=18a66015dbeac5447b62f4ef869a252f9e7000e6;p=nageru

diff --git a/meson.build b/meson.build
index fca2df9..404f0af 100644
--- a/meson.build
+++ b/meson.build
@@ -1,4 +1,4 @@
-project('nageru', 'cpp', default_options: ['buildtype=debugoptimized'], version: '1.8.0-pre')
+project('nageru', 'cpp', default_options: ['buildtype=debugoptimized'], version: '1.8.0')
 
 cxx = meson.get_compiler('cpp')
 qt5 = import('qt5')
@@ -10,7 +10,6 @@ alsadep = dependency('alsa')
 bmusbdep = dependency('bmusb', required: not embedded_bmusb)
 dldep = cxx.find_library('dl')
 epoxydep = dependency('epoxy')
-epoxydep = dependency('epoxy')
 libavcodecdep = dependency('libavcodec')
 libavformatdep = dependency('libavformat')
 libavresampledep = dependency('libavresample')
@@ -22,7 +21,7 @@ luajitdep = dependency('luajit')
 movitdep = dependency('movit')
 protobufdep = dependency('protobuf')
 qcustomplotdep = cxx.find_library('qcustomplot')
-qt5deps = dependency('qt5', modules: ['Core', 'Gui', 'Widgets', 'OpenGLExtensions', 'OpenGL', 'PrintSupport'])
+qt5deps = dependency('qt5', modules: ['Core', 'Gui', 'Widgets', 'OpenGLExtensions', 'OpenGL', 'Network'])
 sdl2_imagedep = dependency('SDL2_image')
 sdl2dep = dependency('sdl2')
 sqlite3dep = dependency('sqlite3')
@@ -297,6 +296,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 += moc_files
 futatabi_srcs += proto_generated
 
@@ -313,7 +313,13 @@ endforeach
 futatabi_shader_srcs = bin2h_gen.process(shaders)
 futatabi_srcs += futatabi_shader_srcs
 
-executable('futatabi', futatabi_srcs, dependencies: [shareddep, qt5deps, libjpegdep, movitdep, libmicrohttpddep, protobufdep, sqlite3dep, vax11dep, vadrmdep, x11dep, libavformatdep, libavcodecdep, libavutildep, libswscaledep], link_with: shared, include_directories: [include_directories('futatabi')])
+executable('futatabi', futatabi_srcs,
+	dependencies: [shareddep, qt5deps, libjpegdep, movitdep, libmicrohttpddep, protobufdep, sqlite3dep, vax11dep, vadrmdep, x11dep, libavformatdep, libavcodecdep, libavutildep, libswscaledep],
+	link_with: shared,
+	include_directories: [include_directories('futatabi')],
+	install: true)
+
+# Test binaries for the optical flow code.
 executable('flow', 'futatabi/flow_main.cpp', 'futatabi/flow.cpp', 'futatabi/gpu_timers.cpp', futatabi_shader_srcs, dependencies: [shareddep, epoxydep, sdl2dep, sdl2_imagedep])
 executable('eval', 'futatabi/eval.cpp', 'futatabi/util.cpp')
 executable('vis', 'futatabi/vis.cpp', 'futatabi/util.cpp')