From 3b00d60907d27d72193281dec4f189eb7aa3c95a Mon Sep 17 00:00:00 2001 From: timerix Date: Mon, 3 Oct 2022 11:57:45 +0600 Subject: [PATCH] cbuild updated --- .gitignore | 2 +- cbuild | 2 +- default.config | 17 ++++++++++++++--- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index d59895f..cab1d1a 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,4 @@ obj/ .editorconfig *.user *.vcxproj.filters -.config +current.config diff --git a/cbuild b/cbuild index b514eda..bad865d 160000 --- a/cbuild +++ b/cbuild @@ -1 +1 @@ -Subproject commit b514eda08d1db643ec5025be5819e0dfeaf1ef6c +Subproject commit bad865d76c8daf9055d0e82fcd96b5d9c7628cce diff --git a/default.config b/default.config index 66a7fe1..16d1c6b 100644 --- a/default.config +++ b/default.config @@ -1,5 +1,6 @@ #!/bin/bash -CONFIG_VER=2 +CONFIG_VERSION=2 +CBUILD_VERSION=2 PROJECT=kerep CMP_C=gcc @@ -19,42 +20,52 @@ EXEC_FILE=$PROJECT.com SHARED_LIB_FILE=$PROJECT.so STATIC_LIB_FILE=$PROJECT.a -PRE_BUILD_SCRIPT=tasks/pre_build.sh - 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= ;; 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= ;; build_shared_lib) C_ARGS="-O2 -fpic -flto -shared" CPP_ARGS="$C_ARGS" LINKER_ARGS="-Wl,-soname,$SHARED_LIB_FILE" TASK_SCRIPT=cbuild/default_tasks/build_shared_lib.sh + PRE_TASK_SCRIPT=tasks/pre_build.sh + POST_TASK_SCRIPT= ;; build_shared_lib_dbg) C_ARGS="-O0 -g -fpic -shared" CPP_ARGS="$C_ARGS" LINKER_ARGS="-Wl,-soname,$SHARED_LIB_FILE" TASK_SCRIPT=cbuild/default_tasks/build_shared_lib.sh + PRE_TASK_SCRIPT=tasks/pre_build.sh + POST_TASK_SCRIPT= ;; build_static_lib) C_ARGS="-O2 -fpic" CPP_ARGS="$C_ARGS" TASK_SCRIPT=cbuild/default_tasks/build_static_lib.sh + PRE_TASK_SCRIPT=tasks/pre_build.sh + POST_TASK_SCRIPT= ;; build_static_lib_dbg) C_ARGS="-O0 -g" CPP_ARGS="$C_ARGS" TASK_SCRIPT=cbuild/default_tasks/build_static_lib.sh + PRE_TASK_SCRIPT=tasks/pre_build.sh + POST_TASK_SCRIPT= ;; exec) TASK_SCRIPT=cbuild/default_tasks/exec.sh