diff --git a/README.md b/README.md index 91962a8..a51501e 100755 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ Движок для OpenCV, OpenGL и ImGui седержащих проектов. -Пример использования предстален в папке sandbox. +Пример использования предстален в папке bin.
diff --git a/example/layers/meson.build b/bin/layers/meson.build
similarity index 100%
rename from example/layers/meson.build
rename to bin/layers/meson.build
diff --git a/example/layers/ui_layer/ui_layer.cpp b/bin/layers/ui_layer/ui_layer.cpp
similarity index 100%
rename from example/layers/ui_layer/ui_layer.cpp
rename to bin/layers/ui_layer/ui_layer.cpp
diff --git a/example/layers/ui_layer/ui_layer.hpp b/bin/layers/ui_layer/ui_layer.hpp
similarity index 100%
rename from example/layers/ui_layer/ui_layer.hpp
rename to bin/layers/ui_layer/ui_layer.hpp
diff --git a/example/layers/ui_layer_double/ui_layer_double.cpp b/bin/layers/ui_layer_double/ui_layer_double.cpp
similarity index 100%
rename from example/layers/ui_layer_double/ui_layer_double.cpp
rename to bin/layers/ui_layer_double/ui_layer_double.cpp
diff --git a/example/layers/ui_layer_double/ui_layer_double.hpp b/bin/layers/ui_layer_double/ui_layer_double.hpp
similarity index 100%
rename from example/layers/ui_layer_double/ui_layer_double.hpp
rename to bin/layers/ui_layer_double/ui_layer_double.hpp
diff --git a/example/layers/utils.hpp b/bin/layers/utils.hpp
similarity index 100%
rename from example/layers/utils.hpp
rename to bin/layers/utils.hpp
diff --git a/example/main.cpp b/bin/main.cpp
similarity index 100%
rename from example/main.cpp
rename to bin/main.cpp
diff --git a/example/meson.build b/bin/meson.build
similarity index 100%
rename from example/meson.build
rename to bin/meson.build
diff --git a/meson.build b/meson.build
index 09a47fe..f1fd6a6 100755
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
project(
meson.current_source_dir().split('/').get(-1),
'cpp',
- version : '1.0.0',
+ version : run_command('git', 'rev-parse', '--short', 'HEAD', check: false).stdout().strip(),
default_options : [
'warning_level=1',
'optimization=3',
@@ -50,5 +50,5 @@ inc = []
#############################################################
subdir('src')
-subdir('example/layers')
-subdir('example')
+subdir('bin/layers')
+subdir('bin')
diff --git a/run.sh b/run.sh
deleted file mode 100755
index db2fe01..0000000
--- a/run.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/zsh
-
-PROJECT_NAME=$(basename $PWD)
-
-run() {
- command meson compile -C build
- if [[ -z "$1" ]]; then
- cd build
- ./example/$PROJECT_NAME
- cd ..
- else
- meson test $1 -C build
- fi
-}
-
-if [ -d "build" ]; then
- run
-else
- command meson setup build
- run
-fi