From d4a6aa2f62d7c69ac195f8ba06df574241a6c65f Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Wed, 17 Jul 2019 22:32:29 -0500 Subject: [PATCH] Cleanup: re-organize object file generation into separate directory The object files should be added in an 'objects/' directory instead of in 'libraray/static/' directory. --- build/scripts/generate.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build/scripts/generate.sh b/build/scripts/generate.sh index 5b40aea..0ba7f40 100644 --- a/build/scripts/generate.sh +++ b/build/scripts/generate.sh @@ -238,7 +238,7 @@ generate_prepare_build(){ local level=${variables[$(generate_id project_level)]} local alt=$1 - mkdir -vp ${path_build}{includes,programs/{shared,static},libraries/{shared,static},settings} || failure=1 + mkdir -vp ${path_build}{includes,programs/{shared,static},libraries/{shared,static},objects,settings} || failure=1 if [[ $failure == "" && $level != "" ]] ; then mkdir -vp ${path_build}includes/level_$level || failure=1 @@ -339,10 +339,10 @@ generate_operation_build(){ sources= if [[ $sources_library != "" ]] ; then for i in $sources_library ; do - sources="$sources${path_build}libraries/$i.o " + sources="$sources${path_build}objects/$i.o " - echo $compiler $path_c$i -c -static -o ${path_build}libraries/static/$i.o $arguments ${variables[$(generate_id flags_static)]} ${variables[$(generate_id flags_library)]} - $compiler $path_c$i -c -static -o ${path_build}libraries/static/$i.o $arguments ${variables[$(generate_id flags_static)]} ${variables[$(generate_id flags_library)]} || failure=1 + echo $compiler $path_c$i -c -static -o ${path_build}objects/$i.o $arguments ${variables[$(generate_id flags_static)]} ${variables[$(generate_id flags_library)]} + $compiler $path_c$i -c -static -o ${path_build}objects/$i.o $arguments ${variables[$(generate_id flags_static)]} ${variables[$(generate_id flags_library)]} || failure=1 if [[ $failure == "1" ]] ; then break; -- 1.8.3.1