From 07c53c9046414ffb38ba439a1408e465e7a298c6 Mon Sep 17 00:00:00 2001 From: Timerix Date: Fri, 8 Aug 2025 21:46:54 +0300 Subject: [PATCH] changed bearssl out dir to the git-ignored one --- dependencies/bearssl.config | 9 ++++++--- dependencies/bearssl.project.config | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dependencies/bearssl.config b/dependencies/bearssl.config index 51e2eed..9bfbc87 100644 --- a/dependencies/bearssl.config +++ b/dependencies/bearssl.config @@ -1,16 +1,19 @@ #!/usr/bin/env bash DEP_WORKING_DIR="dependencies/BearSSL" -DEP_PRE_BUILD_COMMAND="" -DEP_POST_BUILD_COMMAND="" + projconfig_path="../bearssl.project.config" if [[ "$TASK" = *_dbg ]]; then dep_build_target="build_static_lib_dbg" else dep_build_target="build_static_lib" fi + +DEP_PRE_BUILD_COMMAND="" DEP_BUILD_COMMAND="cbuild -c $projconfig_path $dep_build_target" +DEP_POST_BUILD_COMMAND="mv -v cbuild.log ../bin/cbuild_bearssl.log" DEP_CLEAN_COMMAND="cbuild -c $projconfig_path clean" + DEP_DYNAMIC_OUT_FILES="" -DEP_STATIC_OUT_FILES="bin/libbearssl.a" +DEP_STATIC_OUT_FILES="../bin/libbearssl.a" DEP_OTHER_OUT_FILES="" PRESERVE_OUT_DIRECTORY_STRUCTURE=false diff --git a/dependencies/bearssl.project.config b/dependencies/bearssl.project.config index cd3ff78..4c2f78a 100644 --- a/dependencies/bearssl.project.config +++ b/dependencies/bearssl.project.config @@ -24,7 +24,7 @@ ENABLED_DEPENDENCIES='' # ├── static_libs/ - Symbolic links to dynamic libraries used by linker. Cleans on each call of build task. # └── profile/ - gcc *.gcda profiling info files OBJDIR="obj" -OUTDIR="bin" +OUTDIR="../bin" STATIC_LIB_FILE="lib$PROJECT.a" INCLUDE="-I./src -I./inc"