From bfc4e3f1ac227d01cb5995ffaa849d3b5a5f382c Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Sun, 17 May 2020 02:57:24 -0500 Subject: [PATCH] Cleanup: fix build issues relating to build settings Get the individual builds back in working order in regards to build configuration. --- level_0/f_path/data/build/settings | 6 +++--- level_1/fl_color/data/build/settings | 2 +- level_1/fl_console/data/build/settings | 2 +- level_1/fl_fss/data/build/settings | 2 +- level_1/fl_print/c/print.h | 5 ----- level_1/fl_print/data/build/dependencies | 2 +- level_1/fl_print/data/build/settings | 2 +- level_2/fll_directory/data/build/settings | 2 +- level_2/fll_execute/data/build/settings | 2 +- level_2/fll_fss/data/build/settings | 2 +- level_2/fll_program/data/build/settings | 2 +- level_2/fll_status/data/build/settings | 2 +- level_3/byte_dump/data/build/settings | 2 +- level_3/fake/data/build/dependencies | 5 +++-- level_3/fake/data/build/settings | 5 +++-- level_3/firewall/data/build/dependencies | 2 ++ level_3/firewall/data/build/settings | 2 +- level_3/fss_basic_list_read/c/fss_basic_list_read.h | 6 +++--- level_3/fss_basic_list_read/data/build/dependencies | 3 ++- level_3/fss_basic_list_read/data/build/settings | 2 +- level_3/fss_basic_list_write/data/build/dependencies | 3 ++- level_3/fss_basic_list_write/data/build/settings | 2 +- level_3/fss_basic_read/c/fss_basic_read.h | 6 +++--- level_3/fss_basic_read/data/build/dependencies | 3 ++- level_3/fss_basic_read/data/build/settings | 2 +- level_3/fss_basic_write/data/build/dependencies | 3 ++- level_3/fss_basic_write/data/build/settings | 2 +- level_3/fss_extended_list_read/c/fss_extended_list_read.h | 6 +++--- level_3/fss_extended_list_read/data/build/dependencies | 3 ++- level_3/fss_extended_list_read/data/build/settings | 2 +- level_3/fss_extended_read/c/fss_extended_read.h | 6 +++--- level_3/fss_extended_read/data/build/dependencies | 3 ++- level_3/fss_extended_read/data/build/settings | 2 +- level_3/fss_extended_write/data/build/dependencies | 3 ++- level_3/fss_extended_write/data/build/settings | 2 +- level_3/fss_status_code/data/build/dependencies | 3 ++- level_3/fss_status_code/data/build/settings | 2 +- level_3/init/c/init.h | 6 +++--- level_3/init/data/build/dependencies | 3 ++- level_3/init/data/build/settings | 2 +- level_3/status_code/data/build/settings | 2 +- 41 files changed, 66 insertions(+), 58 deletions(-) diff --git a/level_0/f_path/data/build/settings b/level_0/f_path/data/build/settings index fde4046..f939ecf 100644 --- a/level_0/f_path/data/build/settings +++ b/level_0/f_path/data/build/settings @@ -11,9 +11,9 @@ build_compiler gcc build_linker ar build_libraries -lc build_libraries_fll -lf_utf -lf_memory -build_sources_library -build_sources_program path.c -build_sources_headers path_fll.h path_filesystem.h path.h +build_sources_library path.c +build_sources_program +build_sources_headers path.h build_sources_bash build_sources_settings build_shared yes diff --git a/level_1/fl_color/data/build/settings b/level_1/fl_color/data/build/settings index 74b9847..c6baa04 100644 --- a/level_1/fl_color/data/build/settings +++ b/level_1/fl_color/data/build/settings @@ -10,7 +10,7 @@ version_micro 0 build_compiler gcc build_linker ar build_libraries -lc -build_libraries_fll -lf_print -lf_file -lf_memory +build_libraries_fll -lf_file -lf_print -lf_memory build_sources_library color.c build_sources_program build_sources_headers color.h diff --git a/level_1/fl_console/data/build/settings b/level_1/fl_console/data/build/settings index d889225..3035efb 100644 --- a/level_1/fl_console/data/build/settings +++ b/level_1/fl_console/data/build/settings @@ -10,7 +10,7 @@ version_micro 0 build_compiler gcc build_linker ar build_libraries -lc -build_libraries_fll -lf_console -lf_conversion -lf_memory -lf_utf +build_libraries_fll -lf_console -lf_conversion -lf_utf -lf_memory build_sources_library console.c build_sources_program build_sources_headers console.h diff --git a/level_1/fl_fss/data/build/settings b/level_1/fl_fss/data/build/settings index cbcad2f..26c10c4 100644 --- a/level_1/fl_fss/data/build/settings +++ b/level_1/fl_fss/data/build/settings @@ -10,7 +10,7 @@ version_micro 0 build_compiler gcc build_linker ar build_libraries -lc -build_libraries_fll -lf_utf -lf_file -lf_conversion -lf_memory +build_libraries_fll -lf_conversion -lf_file -lf_utf -lf_memory build_sources_library fss.c fss_basic.c fss_basic_list.c fss_extended.c fss_extended_list.c build_sources_program build_sources_headers fss.h fss_basic.h fss_basic_list.h fss_extended.h fss_extended_list.h fss_macro.h fss_status.h diff --git a/level_1/fl_print/c/print.h b/level_1/fl_print/c/print.h index a4cb36e..54c9519 100644 --- a/level_1/fl_print/c/print.h +++ b/level_1/fl_print/c/print.h @@ -19,11 +19,6 @@ #include #include -// fll-1 includes -#include -#include -#include - #ifdef __cplusplus extern "C" { #endif diff --git a/level_1/fl_print/data/build/dependencies b/level_1/fl_print/data/build/dependencies index c6a7da6..bb1c052 100644 --- a/level_1/fl_print/data/build/dependencies +++ b/level_1/fl_print/data/build/dependencies @@ -2,6 +2,6 @@ f_type f_status f_memory f_string -f_conversion f_utf +f_conversion f_print diff --git a/level_1/fl_print/data/build/settings b/level_1/fl_print/data/build/settings index 4c16e3a..c7d93d3 100644 --- a/level_1/fl_print/data/build/settings +++ b/level_1/fl_print/data/build/settings @@ -10,7 +10,7 @@ version_micro 0 build_compiler gcc build_linker ar build_libraries -lc -build_libraries_fll -lf_print -lf_utf -lf_conversion -lf_memory +build_libraries_fll -lf_conversion -lf_print -lf_utf -lf_memory build_sources_library print.c build_sources_program build_sources_headers print.h diff --git a/level_2/fll_directory/data/build/settings b/level_2/fll_directory/data/build/settings index add38a4..162f2c4 100644 --- a/level_2/fll_directory/data/build/settings +++ b/level_2/fll_directory/data/build/settings @@ -10,7 +10,7 @@ version_micro 0 build_compiler gcc build_linker ar build_libraries -lc -build_libraries_fll -lfl_string -lf_directory -lf_memory -lf_file +build_libraries_fll -lfl_string -lf_directory -lf_file -lf_memory build_sources_library directory.c build_sources_program build_sources_headers directory.h diff --git a/level_2/fll_execute/data/build/settings b/level_2/fll_execute/data/build/settings index 211a37f..3d04442 100644 --- a/level_2/fll_execute/data/build/settings +++ b/level_2/fll_execute/data/build/settings @@ -10,7 +10,7 @@ version_micro 0 build_compiler gcc build_linker ar build_libraries -lc -build_libraries_fll -lfl_string -lf_environment -lf_file -lf_path -lf_memory +build_libraries_fll -lfl_string -lf_file -lf_environment -lf_path -lf_memory build_sources_library execute.c private-execute.c build_sources_program build_sources_headers execute.h diff --git a/level_2/fll_fss/data/build/settings b/level_2/fll_fss/data/build/settings index 1f4577f..377b716 100644 --- a/level_2/fll_fss/data/build/settings +++ b/level_2/fll_fss/data/build/settings @@ -10,7 +10,7 @@ version_micro 0 build_compiler gcc build_linker ar build_libraries -lc -build_libraries_fll -lfl_string -lfl_status -lfl_fss -lf_file -lf_utf -lf_conversion -lf_memory +build_libraries_fll -lfl_status -lfl_string -lfl_fss -lf_conversion -lf_file -lf_utf -lf_memory build_sources_library fss.c fss_basic.c fss_basic_list.c fss_extended.c fss_extended_list.c fss_status.c build_sources_program build_sources_headers fss.h fss_basic.h fss_basic_list.h fss_extended.h fss_extended_list.h fss_status.h diff --git a/level_2/fll_program/data/build/settings b/level_2/fll_program/data/build/settings index 055cfed..f0c0de6 100644 --- a/level_2/fll_program/data/build/settings +++ b/level_2/fll_program/data/build/settings @@ -10,7 +10,7 @@ version_micro 0 build_compiler gcc build_linker ar build_libraries -lc -build_libraries_fll -lfl_color -lfl_string -lf_utf -lf_print -lf_file -lf_console -lf_memory +build_libraries_fll -lfl_color -lfl_string -lf_console -lf_file -lf_print -lf_utf -lf_memory build_sources_library program.c build_sources_program build_sources_headers program.h diff --git a/level_2/fll_status/data/build/settings b/level_2/fll_status/data/build/settings index c83f6da..6602c95 100644 --- a/level_2/fll_status/data/build/settings +++ b/level_2/fll_status/data/build/settings @@ -10,7 +10,7 @@ version_micro 0 build_compiler gcc build_linker ar build_libraries -lc -build_libraries_fll -lfl_string -lfl_status -lf_utf -lf_conversion -lf_memory +build_libraries_fll -lfl_status -lfl_string -lf_conversion -lf_utf -lf_memory build_sources_library status.c build_sources_program build_sources_headers status.h diff --git a/level_3/byte_dump/data/build/settings b/level_3/byte_dump/data/build/settings index f13ab91..d286eb0 100644 --- a/level_3/byte_dump/data/build/settings +++ b/level_3/byte_dump/data/build/settings @@ -10,7 +10,7 @@ version_micro 0 build_compiler gcc build_linker ar build_libraries -lc -build_libraries_fll -lfll_program -lfl_utf -lfl_string -lfl_file -lfl_console -lfl_color -lf_utf -lf_print -lf_pipe -lf_file -lf_conversion -lf_console -lf_memory +build_libraries_fll -lfll_program -lfl_color -lfl_console -lfl_file -lfl_string -lfl_utf -lf_console -lf_conversion -lf_file -lf_pipe -lf_print -lf_utf -lf_memory build_libraries_fll-level -lfll_2 -lfll_1 -lfll_0 build_libraries_fll-monolithic -lfll build_sources_library byte_dump.c private-byte_dump.c diff --git a/level_3/fake/data/build/dependencies b/level_3/fake/data/build/dependencies index f5ad7df..6fdf8aa 100644 --- a/level_3/fake/data/build/dependencies +++ b/level_3/fake/data/build/dependencies @@ -2,20 +2,21 @@ f_type f_status f_memory f_string +f_utf f_color f_console f_conversion +f_directory f_environment f_fss f_file f_path f_print -f_utf fl_color fl_console -fl_directory fl_file fl_fss +fl_status fl_string fl_utf fll_fss diff --git a/level_3/fake/data/build/settings b/level_3/fake/data/build/settings index e9c26ec..b8a3ea4 100644 --- a/level_3/fake/data/build/settings +++ b/level_3/fake/data/build/settings @@ -9,6 +9,7 @@ version_micro 0 process_pre process_pre.sh process_post process_post.sh +process_environment modes individual level monolithic modes_default individual @@ -16,10 +17,10 @@ modes_default individual build_compiler gcc build_linker ar build_libraries -lc -build_libraries_fll -lfll_program -lfll_fss -lfll_execute -lfl_utf -lfl_string -lfl_file -lfl_fss -lfl_directory -lfl_console -lfl_color -lf_utf -lf_print -lf_path -lf_environment -lf_file -lf_conversion -lf_console -lf_memory +build_libraries_fll -lfll_program -lfll_execute -lfll_fss -lfl_color -lfl_console -lfl_file -lfl_fss -lfl_status -lfl_string -lfl_utf -lf_environment -lf_file -lf_console -lf_conversion -lf_directory -lf_path -lf_print -lf_utf -lf_memory build_libraries_fll-level -lfll_2 -lfll_1 -lfll_0 build_libraries_fll-monolithic -lfll -build_libraries-individual -lfll_program -lfll_fss -lfll_execute -lfl_utf -lfl_string -lfl_file -lfl_fss -lfl_directory -lfl_console -lfl_color -lf_utf -lf_print -lf_path -lf_environment -lf_file -lf_conversion -lf_console -lf_memory +build_libraries-individual -lfll_program -lfll_execute -lfll_fss -lfl_color -lfl_console -lfl_file -lfl_fss -lfl_status -lfl_string -lfl_utf -lf_environment -lf_file -lf_console -lf_conversion -lf_directory -lf_path -lf_print -lf_utf -lf_memory build_libraries-level -lfll_2 -lfll_1 -lfll_0 build_libraries-monolithic -lfll build_sources_library fake.c private-fake.c private-clean.c private-build.c private-make.c private-skeleton.c diff --git a/level_3/firewall/data/build/dependencies b/level_3/firewall/data/build/dependencies index 74d54e8..a9234c2 100644 --- a/level_3/firewall/data/build/dependencies +++ b/level_3/firewall/data/build/dependencies @@ -5,7 +5,9 @@ f_string f_color f_console f_directory +f_environment f_fss +f_path f_pipe f_print f_utf diff --git a/level_3/firewall/data/build/settings b/level_3/firewall/data/build/settings index c824b5a..67c0651 100644 --- a/level_3/firewall/data/build/settings +++ b/level_3/firewall/data/build/settings @@ -10,7 +10,7 @@ version_micro 0 build_compiler gcc build_linker ar build_libraries -lc -build_libraries_fll -lfll_program -lfll_fss -lfll_execute -lfl_string -lfl_status -lfl_fss -lf_conversion -lfl_file -lfl_console -lfl_color -lf_file -lf_utf -lf_print -lf_pipe -lf_path -lf_directory -lf_console -lf_memory +build_libraries_fll -lfll_execute -lfll_fss -lfll_program -lfl_color -lfl_console -lfl_file -lfl_fss -lfl_status -lfl_string -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_path -lf_pipe -lf_print -lf_utf -lf_memory build_libraries_fll-level -lfll_2 -lfll_1 -lfll_0 build_libraries_fll-monolithic -lfll build_sources_library firewall.c private-firewall.c diff --git a/level_3/fss_basic_list_read/c/fss_basic_list_read.h b/level_3/fss_basic_list_read/c/fss_basic_list_read.h index c9d509d..409e8ca 100644 --- a/level_3/fss_basic_list_read/c/fss_basic_list_read.h +++ b/level_3/fss_basic_list_read/c/fss_basic_list_read.h @@ -20,17 +20,17 @@ #include // fll-0 includes +#include +#include #include +#include #include #include #include -#include -#include // fll-1 includes #include #include -#include #include #include #include diff --git a/level_3/fss_basic_list_read/data/build/dependencies b/level_3/fss_basic_list_read/data/build/dependencies index 485e88a..0296fba 100644 --- a/level_3/fss_basic_list_read/data/build/dependencies +++ b/level_3/fss_basic_list_read/data/build/dependencies @@ -4,12 +4,13 @@ f_memory f_string f_color f_console +f_directory +f_environment f_fss f_pipe f_print fl_color fl_console -fl_directory fl_file fl_fss fl_print diff --git a/level_3/fss_basic_list_read/data/build/settings b/level_3/fss_basic_list_read/data/build/settings index d741f4e..9b21cbe 100644 --- a/level_3/fss_basic_list_read/data/build/settings +++ b/level_3/fss_basic_list_read/data/build/settings @@ -10,7 +10,7 @@ version_micro 0 build_compiler gcc build_linker ar build_libraries -lc -build_libraries_fll -lfll_program -lfll_file -lfll_fss -lfll_execute -lfl_color -lfl_console -lf_conversion -lfl_directory -lfl_file -lfl_fss -lfl_print -lfl_status -lfl_string -lf_utf -lf_file -lf_print -lf_pipe -lf_path -lf_console -lf_memory +build_libraries_fll -lfll_execute -lfll_file -lfll_fss -lfll_program -lfl_color -lfl_console -lfl_file -lfl_fss -lfl_print -lfl_status -lfl_string -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_path -lf_pipe -lf_print -lf_utf -lf_memory build_libraries_fll-level -lfll_2 -lfll_1 -lfll_0 build_libraries_fll-monolithic -lfll build_sources_library fss_basic_list_read.c private-fss_basic_list_read.c diff --git a/level_3/fss_basic_list_write/data/build/dependencies b/level_3/fss_basic_list_write/data/build/dependencies index 9b55f31..78f7cd5 100644 --- a/level_3/fss_basic_list_write/data/build/dependencies +++ b/level_3/fss_basic_list_write/data/build/dependencies @@ -4,12 +4,13 @@ f_memory f_string f_color f_console +f_directory +f_environment f_fss f_pipe f_print fl_color fl_console -fl_directory fl_file fl_fss fl_status diff --git a/level_3/fss_basic_list_write/data/build/settings b/level_3/fss_basic_list_write/data/build/settings index d11305e..287d17e 100644 --- a/level_3/fss_basic_list_write/data/build/settings +++ b/level_3/fss_basic_list_write/data/build/settings @@ -10,7 +10,7 @@ version_micro 0 build_compiler gcc build_linker ar build_libraries -lc -build_libraries_fll -lfll_program -lfll_file -lfll_fss -lfll_execute -lfl_string -lfl_status -lfl_fss -lf_conversion -lfl_file -lfl_directory -lfl_console -lfl_color -lf_utf -lf_file -lf_print -lf_pipe -lf_path -lf_console -lf_memory +build_libraries_fll -lfll_program -lfll_execute -lfll_file -lfll_fss -lfl_status -lfl_string -lfl_fss -lfl_file -lfl_console -lfl_color -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_path -lf_pipe -lf_print -lf_utf -lf_memory build_libraries_fll-level -lfll_2 -lfll_1 -lfll_0 build_libraries_fll-monolithic -lfll build_sources_library fss_basic_list_write.c diff --git a/level_3/fss_basic_read/c/fss_basic_read.h b/level_3/fss_basic_read/c/fss_basic_read.h index 665c0ef..b98fa3e 100644 --- a/level_3/fss_basic_read/c/fss_basic_read.h +++ b/level_3/fss_basic_read/c/fss_basic_read.h @@ -20,17 +20,17 @@ #include // fll-0 includes +#include +#include #include +#include #include #include #include -#include -#include // fll-1 includes #include #include -#include #include #include #include diff --git a/level_3/fss_basic_read/data/build/dependencies b/level_3/fss_basic_read/data/build/dependencies index 485e88a..0296fba 100644 --- a/level_3/fss_basic_read/data/build/dependencies +++ b/level_3/fss_basic_read/data/build/dependencies @@ -4,12 +4,13 @@ f_memory f_string f_color f_console +f_directory +f_environment f_fss f_pipe f_print fl_color fl_console -fl_directory fl_file fl_fss fl_print diff --git a/level_3/fss_basic_read/data/build/settings b/level_3/fss_basic_read/data/build/settings index 2b1825e..bb73c09 100644 --- a/level_3/fss_basic_read/data/build/settings +++ b/level_3/fss_basic_read/data/build/settings @@ -10,7 +10,7 @@ version_micro 0 build_compiler gcc build_linker ar build_libraries -lc -build_libraries_fll -lfll_program -lfll_file -lfll_fss -lfll_execute -lfl_color -lfl_console -lf_conversion -lfl_directory -lfl_file -lfl_fss -lfl_print -lfl_status -lfl_string -lf_utf -lf_file -lf_print -lf_pipe -lf_path -lf_console -lf_memory +build_libraries_fll -lfll_execute -lfll_file -lfll_fss -lfll_program -lfl_color -lfl_console -lfl_file -lfl_fss -lfl_print -lfl_status -lfl_string -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_path -lf_pipe -lf_print -lf_utf -lf_memory build_libraries_fll-level -lfll_2 -lfll_1 -lfll_0 build_libraries_fll-monolithic -lfll build_sources_library fss_basic_read.c private-fss_basic_read.c diff --git a/level_3/fss_basic_write/data/build/dependencies b/level_3/fss_basic_write/data/build/dependencies index 9b55f31..78f7cd5 100644 --- a/level_3/fss_basic_write/data/build/dependencies +++ b/level_3/fss_basic_write/data/build/dependencies @@ -4,12 +4,13 @@ f_memory f_string f_color f_console +f_directory +f_environment f_fss f_pipe f_print fl_color fl_console -fl_directory fl_file fl_fss fl_status diff --git a/level_3/fss_basic_write/data/build/settings b/level_3/fss_basic_write/data/build/settings index b13e264..f7f1a1d 100644 --- a/level_3/fss_basic_write/data/build/settings +++ b/level_3/fss_basic_write/data/build/settings @@ -10,7 +10,7 @@ version_micro 0 build_compiler gcc build_linker ar build_libraries -lc -build_libraries_fll -lfll_program -lfll_file -lfll_fss -lfll_execute -lfl_string -lfl_status -lfl_fss -lf_conversion -lfl_file -lfl_directory -lfl_console -lfl_color -lf_utf -lf_file -lf_print -lf_pipe -lf_path -lf_console -lf_memory +build_libraries_fll -lfll_execute -lfll_file -lfll_fss -lfll_program -lfl_color -lfl_console -lfl_fss -lfl_file -lfl_status -lfl_string -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_path -lf_pipe -lf_print -lf_utf -lf_memory build_libraries_fll-level -lfll_2 -lfll_1 -lfll_0 build_libraries_fll-monolithic -lfll build_sources_library fss_basic_write.c diff --git a/level_3/fss_extended_list_read/c/fss_extended_list_read.h b/level_3/fss_extended_list_read/c/fss_extended_list_read.h index 3cf1c40..5fdc8e6 100644 --- a/level_3/fss_extended_list_read/c/fss_extended_list_read.h +++ b/level_3/fss_extended_list_read/c/fss_extended_list_read.h @@ -20,17 +20,17 @@ #include // fll-0 includes +#include +#include #include +#include #include #include #include -#include -#include // fll-1 includes #include #include -#include #include #include #include diff --git a/level_3/fss_extended_list_read/data/build/dependencies b/level_3/fss_extended_list_read/data/build/dependencies index 485e88a..0296fba 100644 --- a/level_3/fss_extended_list_read/data/build/dependencies +++ b/level_3/fss_extended_list_read/data/build/dependencies @@ -4,12 +4,13 @@ f_memory f_string f_color f_console +f_directory +f_environment f_fss f_pipe f_print fl_color fl_console -fl_directory fl_file fl_fss fl_print diff --git a/level_3/fss_extended_list_read/data/build/settings b/level_3/fss_extended_list_read/data/build/settings index 912fa86..8aff287 100644 --- a/level_3/fss_extended_list_read/data/build/settings +++ b/level_3/fss_extended_list_read/data/build/settings @@ -10,7 +10,7 @@ version_micro 0 build_compiler gcc build_linker ar build_libraries -lc -build_libraries_fll -lfll_program -lfll_file -lfll_fss -lfll_execute -lfl_color -lfl_console -lf_conversion -lfl_directory -lfl_file -lfl_fss -lfl_print -lfl_status -lfl_string -lf_utf -lf_file -lf_print -lf_pipe -lf_path -lf_console -lf_memory +build_libraries_fll -lfll_execute -lfll_file -lfll_fss -lfll_program -lfl_color -lfl_console -lfl_file -lfl_fss -lfl_print -lfl_status -lfl_string -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_path -lf_pipe -lf_print -lf_utf -lf_memory build_libraries_fll-level -lfll_2 -lfll_1 -lfll_0 build_libraries_fll-monolithic -lfll build_sources_library fss_extended_list_read.c private-fss_extended_list_read.c diff --git a/level_3/fss_extended_read/c/fss_extended_read.h b/level_3/fss_extended_read/c/fss_extended_read.h index b2798ec..4dc0ec8 100644 --- a/level_3/fss_extended_read/c/fss_extended_read.h +++ b/level_3/fss_extended_read/c/fss_extended_read.h @@ -20,17 +20,17 @@ #include // fll-0 includes +#include +#include #include +#include #include #include #include -#include -#include // fll-1 includes #include #include -#include #include #include #include diff --git a/level_3/fss_extended_read/data/build/dependencies b/level_3/fss_extended_read/data/build/dependencies index 485e88a..0296fba 100644 --- a/level_3/fss_extended_read/data/build/dependencies +++ b/level_3/fss_extended_read/data/build/dependencies @@ -4,12 +4,13 @@ f_memory f_string f_color f_console +f_directory +f_environment f_fss f_pipe f_print fl_color fl_console -fl_directory fl_file fl_fss fl_print diff --git a/level_3/fss_extended_read/data/build/settings b/level_3/fss_extended_read/data/build/settings index e2687c5..0f6c617 100644 --- a/level_3/fss_extended_read/data/build/settings +++ b/level_3/fss_extended_read/data/build/settings @@ -10,7 +10,7 @@ version_micro 0 build_compiler gcc build_linker ar build_libraries -lc -build_libraries_fll -lfll_program -lfll_file -lfll_fss -lfll_execute -lfl_color -lfl_console -lf_conversion -lfl_directory -lfl_file -lfl_fss -lfl_print -lfl_status -lfl_string -lf_utf -lf_file -lf_print -lf_pipe -lf_path -lf_console -lf_memory +build_libraries_fll -lfll_execute -lfll_file -lfll_fss -lfll_program -lfl_color -lfl_console -lfl_file -lfl_fss -lfl_print -lfl_status -lfl_string -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_path -lf_pipe -lf_print -lf_utf -lf_memory build_libraries_fll-level -lfll_2 -lfll_1 -lfll_0 build_libraries_fll-monolithic -lfll build_sources_library fss_extended_read.c private-fss_extended_read.c diff --git a/level_3/fss_extended_write/data/build/dependencies b/level_3/fss_extended_write/data/build/dependencies index 53066a0..5671e92 100644 --- a/level_3/fss_extended_write/data/build/dependencies +++ b/level_3/fss_extended_write/data/build/dependencies @@ -4,11 +4,12 @@ f_memory f_string f_color f_console +f_directory +f_environment f_fss f_pipe f_print fl_color -fl_directory fl_file fl_fss fl_status diff --git a/level_3/fss_extended_write/data/build/settings b/level_3/fss_extended_write/data/build/settings index d906f7c..8209883 100644 --- a/level_3/fss_extended_write/data/build/settings +++ b/level_3/fss_extended_write/data/build/settings @@ -10,7 +10,7 @@ version_micro 0 build_compiler gcc build_linker ar build_libraries -lc -build_libraries_fll -lfll_program -lfll_file -lfll_fss -lfll_execute -lfl_string -lfl_status -lfl_fss -lf_conversion -lfl_file -lfl_directory -lfl_color -lf_utf -lf_file -lf_print -lf_pipe -lf_path -lf_console -lf_memory +build_libraries_fll -lfll_execute -lfll_file -lfll_fss -lfll_program -lfl_status -lfl_string -lfl_fss -lfl_file -lfl_color -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_path -lf_pipe -lf_print -lf_utf -lf_memory build_libraries_fll-level -lfll_2 -lfll_1 -lfll_0 build_libraries_fll-monolithic -lfll build_sources_library fss_extended_write.c diff --git a/level_3/fss_status_code/data/build/dependencies b/level_3/fss_status_code/data/build/dependencies index 18f7ab2..0b9494e 100644 --- a/level_3/fss_status_code/data/build/dependencies +++ b/level_3/fss_status_code/data/build/dependencies @@ -5,6 +5,8 @@ f_string f_color f_console f_conversion +f_directory +f_environment f_file f_fss f_pipe @@ -12,7 +14,6 @@ f_print f_utf fl_color fl_console -fl_directory fl_file fl_fss fl_status diff --git a/level_3/fss_status_code/data/build/settings b/level_3/fss_status_code/data/build/settings index 2b18744..d7a0815 100644 --- a/level_3/fss_status_code/data/build/settings +++ b/level_3/fss_status_code/data/build/settings @@ -10,7 +10,7 @@ version_micro 0 build_compiler gcc build_linker ar build_libraries -lc -build_libraries_fll -lfll_program -lfll_file -lfll_fss -lfll_execute -lfll_status -lfl_utf -lfl_string -lfl_status -lfl_fss -lfl_file -lfl_directory -lfl_console -lfl_color -lf_utf -lf_print -lf_pipe -lf_path -lf_file -lf_conversion -lf_console -lf_memory +build_libraries_fll -lfll_execute -lfll_file -lfll_fss -lfll_program -lfll_status -lfl_console -lfl_color -lfl_file -lfl_fss -lfl_status -lfl_string -lfl_utf -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_path -lf_pipe -lf_print -lf_utf -lf_memory build_libraries_fll-level -lfll_2 -lfll_1 -lfll_0 build_libraries_fll-monolithic -lfll build_sources_library fss_status_code.c private-fss_status_code.c diff --git a/level_3/init/c/init.h b/level_3/init/c/init.h index f724e8c..a9413f2 100644 --- a/level_3/init/c/init.h +++ b/level_3/init/c/init.h @@ -59,18 +59,18 @@ #include // fll-0 includes +#include +#include #include +#include #include #include #include #include -#include -#include // fll-1 includes #include #include -#include #include #include #include diff --git a/level_3/init/data/build/dependencies b/level_3/init/data/build/dependencies index 22893e8..5e3795e 100644 --- a/level_3/init/data/build/dependencies +++ b/level_3/init/data/build/dependencies @@ -4,13 +4,14 @@ f_memory f_string f_color f_console +f_directory +f_environment f_fss f_pipe f_print f_utf fl_color fl_console -fl_directory fl_file fl_fss fl_status diff --git a/level_3/init/data/build/settings b/level_3/init/data/build/settings index 193a4e1..c57c7a6 100644 --- a/level_3/init/data/build/settings +++ b/level_3/init/data/build/settings @@ -10,7 +10,7 @@ version_micro 0 build_compiler gcc build_linker ar build_libraries -lc -build_libraries_fll -lfll_program -lfll_fss -lfll_execute -lfl_string -lfl_status -lfl_fss -lf_conversion -lfl_file -lfl_directory -lfl_console -lfl_color -lf_file -lf_utf -lf_print -lf_pipe -lf_path -lf_console -lf_memory +build_libraries_fll -lfll_execute -lfll_fss -lfll_program -lfl_console -lfl_color -lfl_file -lfl_fss -lfl_status -lfl_string -lf_file -lf_console -lf_conversion -lf_directory -lf_environment -lf_path -lf_pipe -lf_print -lf_utf -lf_memory build_libraries_fll-level -lfll_2 -lfll_1 -lfll_0 build_libraries_fll-monolithic -lfll build_sources_library init.c private-init.c diff --git a/level_3/status_code/data/build/settings b/level_3/status_code/data/build/settings index c95eac8..28fd3a1 100644 --- a/level_3/status_code/data/build/settings +++ b/level_3/status_code/data/build/settings @@ -10,7 +10,7 @@ version_micro 0 build_compiler gcc build_linker ar build_libraries -lc -build_libraries_fll -lfll_status -lfll_program -lfl_utf -lfl_string -lfl_status -lfl_file -lfl_console -lfl_color -lf_utf -lf_print -lf_pipe -lf_path -lf_file -lf_conversion -lf_console -lf_memory +build_libraries_fll -lfll_program -lfll_status -lfl_color -lfl_console -lfl_file -lfl_status -lfl_string -lfl_utf -lf_console -lf_conversion -lf_file -lf_path -lf_pipe -lf_print -lf_utf -lf_memory build_libraries_fll-level -lfll_2 -lfll_1 -lfll_0 build_libraries_fll-monolithic -lfll build_sources_library status_code.c private-status_code.c -- 1.8.3.1