ed/metadesk
1
0
Fork 0
mirror of https://github.com/Ed94/metadesk.git synced 2026-08-06 15:48:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

[bld] setup new feature for include path management

Browse Source
This commit is contained in:
Allen Webster
2021-09-25 17:37:33 -07:00
parent 70e630cab6
commit 3f5d4a96a9
9 changed files with 88 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/bld_core.sh
+17 -9
View File
@@ -186,21 +186,29 @@ function bld_compile {
###### finith in file #####################################################
local final_in_file=$root_path/$in_file
###### finish options #####################################################
local src_opts=($(bld_opts_from_src $final_in_file))
local all_opts=($(bld_dedup ${opts[@]} ${src_opts[@]}))
###### diagnostics ########################################################
local diagnostics=$(bld_has_opt diagnostics ${all_opts[@]})
###### out file name ######################################################
local file_base=${final_in_file##*/}
local file_base_no_ext=${file_base%.*}
local out_file="$file_base_no_ext$dot_ext_obj"
###### finish options #####################################################
local src_opts=($(bld_opts_from_src $final_in_file))
local all_opts=($(bld_dedup $file_base ${opts[@]} ${src_opts[@]}))
###### diagnostics ########################################################
local diagnostics=$(bld_has_opt diagnostics ${all_opts[@]})
###### get real flags #####################################################
local flags_file=$bin_path/compiler_flags.txt
local flags=$(bld_flags_from_opts $flags_file ${all_opts[@]})
local flags=($(bld_flags_from_opts $flags_file ${all_opts[@]}))
###### get inc paths ######################################################
local paths_file=$bin_path/compiler_inc_paths.txt
local paths=($(bld_flags_from_opts $paths_file ${all_opts[@]}))
local incs=()
for ((i=0; i<${#paths[@]}; i+=1)); do
incs+=("-I$root_path/${paths[i]}")
done
###### move to output folder ##############################################
mkdir -p "$build_path"
@@ -211,7 +219,7 @@ function bld_compile {
rm -f "$out_file_base.obj"
###### get flags ##########################################################
local all_flags="-c -I$src_path ${flags}"
local all_flags="-c -I$src_path ${incs[@]} ${flags[@]}"
###### diagnostic output ##################################################
if [ "$diagnostics" == "1" ]; then