Merge pull request #5 from Timerix22/main

merge with main
This commit is contained in:
Timerix22 2022-08-24 13:42:57 +06:00 committed by GitHub
commit af758fc318
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 4 deletions

View File

@ -11,6 +11,9 @@ build_shared_lib:
build_static_lib: build_static_lib:
@build_scripts/build_configurations/build_static_lib.sh @build_scripts/build_configurations/build_static_lib.sh
build_static_lib_dbg:
@build_scripts/build_configurations/build_static_lib_dbg.sh
###### Testing tasks ####### ###### Testing tasks #######
test: build_test test: build_test
@build_scripts/build_configurations/test.sh @build_scripts/build_configurations/test.sh

View File

@ -2,7 +2,7 @@
source build_scripts/init.sh source build_scripts/init.sh
print "${CYAN}==========[build_shared_lib]==========\n" print "${CYAN}==========[build_static_lib]==========\n"
clear_dir "$OUTDIR" clear_dir "$OUTDIR"
clear_dir "$OBJDIR" clear_dir "$OBJDIR"
compile_c "$BUILD_STATIC_LIB_C_ARGS" "$SRC_C tests/test_marshalling.c" compile_c "$BUILD_STATIC_LIB_C_ARGS" "$SRC_C tests/test_marshalling.c"

View File

@ -0,0 +1,10 @@
#!/bin/bash
source build_scripts/init.sh
print "${CYAN}==========[build_static_lib_dbg]==========\n"
clear_dir "$OUTDIR"
clear_dir "$OBJDIR"
compile_c "$BUILD_STATIC_LIB_DBG_C_ARGS" "$SRC_C tests/test_marshalling.c"
compile_cpp "$BUILD_STATIC_LIB_DBG_CPP_ARGS" "$SRC_CPP"
pack_static_lib "$STATIC_LIB_DBG_FILE"

View File

@ -32,8 +32,12 @@ BUILD_SHARED_LIB_C_ARGS="-O2 -fpic -flto -shared"
BUILD_SHARED_LIB_CPP_ARGS="$BUILD_SHARED_LIB_C_ARGS" BUILD_SHARED_LIB_CPP_ARGS="$BUILD_SHARED_LIB_C_ARGS"
BUILD_SHARED_LIB_LINKER_ARGS="-Wl,-soname,$SHARED_LIB_FILE" BUILD_SHARED_LIB_LINKER_ARGS="-Wl,-soname,$SHARED_LIB_FILE"
# build_static_lib
# build_STATIC_LIB
STATIC_LIB_FILE=kerep.a STATIC_LIB_FILE=kerep.a
BUILD_STATIC_LIB_C_ARGS="-O2 -fpic" BUILD_STATIC_LIB_C_ARGS="-O2 -fpic"
BUILD_STATIC_LIB_CPP_ARGS="$BUILD_STATIC_LIB_C_ARGS" BUILD_STATIC_LIB_CPP_ARGS="$BUILD_STATIC_LIB_C_ARGS"
# build_static_lib_dbg
STATIC_LIB_DBG_FILE="$STATIC_LIB_FILE"
BUILD_STATIC_LIB_DBG_C_ARGS="-O0 -g"
BUILD_STATIC_LIB_DBG_CPP_ARGS="$BUILD_STATIC_LIB_DBG_C_ARGS"

View File

@ -1,6 +1,5 @@
#!/bin/bash #!/bin/bash
reset
tabs 4 tabs 4
source build_scripts/colors.sh source build_scripts/colors.sh