diff --git a/.gitignore b/.gitignore index d91d243..4ef5230 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ compile_commands.json tags +rootwater.jpg +images/ +db/ diff --git a/meson.build b/meson.build index 5673c87..4ac013e 100644 --- a/meson.build +++ b/meson.build @@ -1,25 +1,9 @@ project('magicstore', 'cpp', version: '0.1.0', default_options: ['buildtype=debug', 'cpp_std=gnu++17', 'c_std=c11', 'build_testing=true'], + meson_version: '>=0.53.0', ) -libopencv_dep = dependency('opencv4') -libavcodec_dep = dependency('libavcodec', version: '>=58.134.100') -libavutil_dep = dependency('libavutil', version: '>=56.70.100') -libswscale_dep = dependency('libswscale', version: '>=5.9.100') +fs = import('fs') -executable(meson.project_name(), - 'src/main.cpp', - 'src/camera.cpp', - 'src/file_handle.cpp', - 'src/ffmpeg/avcodec.cpp', - 'src/ffmpeg/avdeleter.cpp', - 'src/ffmpeg/decoder.cpp', - dependencies: [ - libopencv_dep, - libavcodec_dep, - libavutil_dep, - libswscale_dep, - ], - install: true, -) +subdir('src') diff --git a/src/meson.build b/src/meson.build new file mode 100644 index 0000000..dd34e73 --- /dev/null +++ b/src/meson.build @@ -0,0 +1 @@ +subdir('recognition') diff --git a/src/camera.cpp b/src/recognition/camera.cpp similarity index 100% rename from src/camera.cpp rename to src/recognition/camera.cpp diff --git a/src/camera.hpp b/src/recognition/camera.hpp similarity index 100% rename from src/camera.hpp rename to src/recognition/camera.hpp diff --git a/src/ffmpeg/avcodec.cpp b/src/recognition/ffmpeg/avcodec.cpp similarity index 100% rename from src/ffmpeg/avcodec.cpp rename to src/recognition/ffmpeg/avcodec.cpp diff --git a/src/ffmpeg/avcodec.hpp b/src/recognition/ffmpeg/avcodec.hpp similarity index 100% rename from src/ffmpeg/avcodec.hpp rename to src/recognition/ffmpeg/avcodec.hpp diff --git a/src/ffmpeg/avdeleter.cpp b/src/recognition/ffmpeg/avdeleter.cpp similarity index 100% rename from src/ffmpeg/avdeleter.cpp rename to src/recognition/ffmpeg/avdeleter.cpp diff --git a/src/ffmpeg/avdeleter.hpp b/src/recognition/ffmpeg/avdeleter.hpp similarity index 100% rename from src/ffmpeg/avdeleter.hpp rename to src/recognition/ffmpeg/avdeleter.hpp diff --git a/src/ffmpeg/decoder.cpp b/src/recognition/ffmpeg/decoder.cpp similarity index 100% rename from src/ffmpeg/decoder.cpp rename to src/recognition/ffmpeg/decoder.cpp diff --git a/src/ffmpeg/decoder.hpp b/src/recognition/ffmpeg/decoder.hpp similarity index 100% rename from src/ffmpeg/decoder.hpp rename to src/recognition/ffmpeg/decoder.hpp diff --git a/src/file_handle.cpp b/src/recognition/file_handle.cpp similarity index 100% rename from src/file_handle.cpp rename to src/recognition/file_handle.cpp diff --git a/src/file_handle.hpp b/src/recognition/file_handle.hpp similarity index 100% rename from src/file_handle.hpp rename to src/recognition/file_handle.hpp diff --git a/src/main.cpp b/src/recognition/main.cpp similarity index 100% rename from src/main.cpp rename to src/recognition/main.cpp diff --git a/src/recognition/meson.build b/src/recognition/meson.build new file mode 100644 index 0000000..e2f9329 --- /dev/null +++ b/src/recognition/meson.build @@ -0,0 +1,23 @@ +project_name = fs.name(meson.current_source_dir()) + +libopencv_dep = dependency('opencv4') +libavcodec_dep = dependency('libavcodec', version: '>=58.134.100') +libavutil_dep = dependency('libavutil', version: '>=56.70.100') +libswscale_dep = dependency('libswscale', version: '>=5.9.100') + +executable(project_name, + 'main.cpp', + 'camera.cpp', + 'file_handle.cpp', + 'ffmpeg/avcodec.cpp', + 'ffmpeg/avdeleter.cpp', + 'ffmpeg/decoder.cpp', + dependencies: [ + libopencv_dep, + libavcodec_dep, + libavutil_dep, + libswscale_dep, + ], + install: true, +) +