diff --git a/build_scripts/build_configurations/build.sh b/build_scripts/build_configurations/build.sh index b55c2d7..33c7056 100644 --- a/build_scripts/build_configurations/build.sh +++ b/build_scripts/build_configurations/build.sh @@ -1,8 +1,19 @@ #!/bin/bash -source build_scripts/pre_build.sh +source build_scripts/init.sh print "${CYAN}===============[build]================\n" +clear_dir "$OUTDIR" +clear_dir "$OBJDIR" + +cd kerep +if [ ! -f "bin/kerep.a" ]; then + make build_static_lib +fi +cp bin/kerep.a ../obj/ +printf "${GREEN}copied ${CYAN}kerep.a\n" +cd .. + compile_c "$BUILD_C_ARGS" "$SRC_C" compile_cpp "$BUILD_CPP_ARGS" "$SRC_CPP" link "$BUILD_CPP_ARGS $BUILD_LINKER_ARGS" "$BUILD_FILE" diff --git a/build_scripts/build_configurations/build_dbg.sh b/build_scripts/build_configurations/build_dbg.sh index 7a2ace8..4ea09e9 100644 --- a/build_scripts/build_configurations/build_dbg.sh +++ b/build_scripts/build_configurations/build_dbg.sh @@ -1,8 +1,19 @@ #!/bin/bash -source build_scripts/pre_build.sh +source build_scripts/init.sh print "${CYAN}=============[build_dbg]==============\n" +clear_dir "$OUTDIR" +clear_dir "$OBJDIR" + +cd kerep +if [ ! -f "bin/kerep.a" ]; then + make build_static_lib_dbg +fi +cp bin/kerep.a ../obj/ +printf "${GREEN}copied ${CYAN}kerep.a\n" +cd .. + compile_c "$BUILD_DBG_C_ARGS" "$SRC_C" compile_cpp "$BUILD_DBG_CPP_ARGS" "$SRC_CPP" link "$BUILD_DBG_CPP_ARGS $BUILD_DBG_LINKER_ARGS" "$BUILD_FILE" diff --git a/build_scripts/build_deps.sh b/build_scripts/build_deps.sh deleted file mode 100644 index 0a7c42a..0000000 --- a/build_scripts/build_deps.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -source build_scripts/colors.sh - -printf "${CYAN}=============[build_deps]=============\n" - -cd kerep -if [ ! -f "bin/kerep.a" ]; then - printf "${YELLOW}kerep/bin/kerep.a doesn't exist\n" - make build_static_lib -fi -cp bin/kerep.a ../obj/ -printf "${GREEN}copied ${CYAN}kerep.a\n" -cd .. diff --git a/build_scripts/default.config.sh b/build_scripts/default.config.sh index 0b4a139..d90ab94 100644 --- a/build_scripts/default.config.sh +++ b/build_scripts/default.config.sh @@ -19,7 +19,7 @@ BUILD_CPP_ARGS="$BUILD_C_ARGS" BUILD_LINKER_ARGS="" # build_dbg -BUILD_DBG_FILE=$TEST_FILE +BUILD_DBG_FILE="$TEST_FILE.dbg" BUILD_DBG_C_ARGS="-O0 -g" BUILD_DBG_CPP_ARGS="$BUILD_DBG_C_ARGS" BUILD_DBG_LINKER_ARGS="" diff --git a/build_scripts/pre_build.sh b/build_scripts/pre_build.sh index 40bdfeb..34e65d4 100644 --- a/build_scripts/pre_build.sh +++ b/build_scripts/pre_build.sh @@ -1,7 +1,3 @@ #!/bin/bash source build_scripts/init.sh - -clear_dir "$OUTDIR" -clear_dir "$OBJDIR" -bash build_scripts/build_deps.sh \ No newline at end of file