diff --git a/cbuild b/cbuild index bad865d..c0cc240 160000 --- a/cbuild +++ b/cbuild @@ -1 +1 @@ -Subproject commit bad865d76c8daf9055d0e82fcd96b5d9c7628cce +Subproject commit c0cc240d0001bc077d70fa8797d0c4c460f3ee19 diff --git a/default.config b/default.config index dee35b4..52235aa 100644 --- a/default.config +++ b/default.config @@ -1,8 +1,9 @@ #!/bin/bash -CBUILD_VERSION=2 -CONFIG_VERSION=3 +CBUILD_VERSION=3 +CONFIG_VERSION=4 PROJECT=cobek +echo "reading $PROJECT default config..." CMP_C=gcc CMP_CPP=g++ STD_C=c11 @@ -11,8 +12,8 @@ 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')" +#TESTS_C="$( find tests -name '*.c')" +#TESTS_CPP="$(find tests -name '*.cpp')" OUTDIR=bin OBJDIR=obj diff --git a/kerep b/kerep index c2825a9..f75ab3d 160000 --- a/kerep +++ b/kerep @@ -1 +1 @@ -Subproject commit c2825a9540c6a265ed3401c4619dce2f578c416b +Subproject commit f75ab3d1171670a11923d42a1eac4f06a4980d76 diff --git a/tasks/pre_build.sh b/tasks/pre_build.sh index e13c98b..9dcc12e 100644 --- a/tasks/pre_build.sh +++ b/tasks/pre_build.sh @@ -1,7 +1,9 @@ #!/bin/bash cd kerep -make $KEREP_BUILD_TASK +if [ ! -f "bin/kerep.a" ]; then + exec make "$KEREP_BUILD_TASK" +fi cp bin/kerep.a ../obj/ printf "${GREEN}copied ${CYAN}kerep.a\n" -cd .. \ No newline at end of file +cd ..