diff --git a/.gitignore b/.gitignore index 551fb38..87229ff 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,4 @@ obj/ .editorconfig *.user *.vcxproj.filters -.config \ No newline at end of file +current.config \ No newline at end of file diff --git a/current.config b/current.config deleted file mode 100644 index 2e79383..0000000 --- a/current.config +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/bash -CBUILD_VERSION=2 -CONFIG_VER=3 - -PROJECT=cobek -CMP_C=gcc -CMP_CPP=g++ -STD_C=c11 -STD_CPP=c++17 -WARN_C="-Wall -Wno-discarded-qualifiers" -WARN_CPP="-Wall" -SRC_C="$( find src -name '*.c')" -SRC_CPP="$( find src -name '*.cpp')" -TESTS_C="$( find tests -name '*.c')" -TESTS_CPP="$(find tests -name '*.cpp')" - -OUTDIR=bin -OBJDIR=obj -EXEC_FILE=cb2c.com - - -case $TASK in - build_exec) - C_ARGS="-O2" - CPP_ARGS="$C_ARGS" - LINKER_ARGS="" - TASK_SCRIPT=cbuild/default_tasks/build_exec.sh - PRE_TASK_SCRIPT=tasks/pre_build.sh - POST_TASK_SCRIPT="" - KEREP_BUILD_TASK=build_static_lib - ;; - build_exec_dbg) - C_ARGS="-O0 -g" - CPP_ARGS="$C_ARGS" - LINKER_ARGS="" - TASK_SCRIPT=cbuild/default_tasks/build_exec.sh - PRE_TASK_SCRIPT=tasks/pre_build.sh - POST_TASK_SCRIPT="" - KEREP_BUILD_TASK=build_static_lib_dbg - ;; - exec) - TASK_SCRIPT=cbuild/default_tasks/exec.sh - PRE_TASK_SCRIPT="" - POST_TASK_SCRIPT="" - ;; - valgrind) - VALGRIND_ARGS="-s --log-file=valgrind.log --read-var-info=yes --track-origins=yes --fullpath-after=$PROJECT/ --leak-check=full --show-leak-kinds=all" - TASK_SCRIPT=cbuild/default_tasks/valgrind.sh - PRE_TASK_SCRIPT="" - POST_TASK_SCRIPT="" - ;; -esac diff --git a/default.config b/default.config index 2e79383..e14e54d 100644 --- a/default.config +++ b/default.config @@ -1,6 +1,6 @@ #!/bin/bash CBUILD_VERSION=2 -CONFIG_VER=3 +CONFIG_VERSION=3 PROJECT=cobek CMP_C=gcc