From 933b515fadf47e8f029434873974ed62a2d2a86b Mon Sep 17 00:00:00 2001 From: Timerix22 Date: Fri, 19 May 2023 14:10:04 +0600 Subject: [PATCH] updated scripts --- cbuild | 2 +- default.config | 9 ++++----- kerep | 2 +- tasks/rebuild_lib.sh | 1 + 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cbuild b/cbuild index dc5947f..e8e4242 160000 --- a/cbuild +++ b/cbuild @@ -1 +1 @@ -Subproject commit dc5947f92d310f05a8765242bed6b825c043a182 +Subproject commit e8e42424d329ef1e75fb827ddf85d55b4cd89169 diff --git a/default.config b/default.config index 283f771..ffaea7b 100644 --- a/default.config +++ b/default.config @@ -7,7 +7,7 @@ CMP_C="gcc" CMP_CPP="g++" STD_C="c11" STD_CPP="c++11" -WARN_C="-Wall -Wno-ignored-qualifiers -Wextra -Wno-unused-parameter" +WARN_C="-Wall -Wno-discarded-qualifiers -Wextra -Wno-unused-parameter" WARN_CPP="-Wall -Wextra -Wno-unused-parameter" SRC_C="$( find src -name '*.c')" SRC_CPP="$( find src -name '*.cpp')" @@ -15,10 +15,9 @@ SRC_CPP="$( find src -name '*.cpp')" #TESTS_CPP="$(find tests -name '*.cpp')" # OBJDIR structure: -# ├── objects - dir where compiled *.o files are stored. cleans every call of build task -# ├── profile - dir where gcc *.gcda profiling info files stored -# ├── libs - there you can put static libs and linker will find them -# └── out - output files are created here and then copied to OUTDIR +# ├── objects/ - dir where compiled *.o files are stored. cleans every call of build task +# ├── profile/ - dir where gcc *.gcda profiling info files stored +# └── libs/ - there you can put static libs and linker will find them OBJDIR="obj" OUTDIR="bin" diff --git a/kerep b/kerep index 8ea44cd..26b69f9 160000 --- a/kerep +++ b/kerep @@ -1 +1 @@ -Subproject commit 8ea44cdc24120ce6e13b0a92767e2002123b1bc1 +Subproject commit 26b69f9b7bb7a816b8f048557efe0641428b9e80 diff --git a/tasks/rebuild_lib.sh b/tasks/rebuild_lib.sh index 3c62a17..7e2928a 100644 --- a/tasks/rebuild_lib.sh +++ b/tasks/rebuild_lib.sh @@ -2,4 +2,5 @@ source cbuild/colors.sh source cbuild/functions.sh touch ".rebuild_$1.tmp" +rm -fv "obj/libs/$1.a" myprint "${YELLOW}$1.a will be rebuilt in the next build task"