Fix a variable conflict in the Meson build files.

[nageru] / meson.build

diff --git a/meson.build b/meson.build
index 9ce748cae541fd4b77a7cfe6fdb6973fb8fd8164..46060a00ad7ccd4eba0e86086213cd374dc4b8f6 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -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')
@@ -314,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')