diff --git a/.gitignore b/.gitignore index 6df861f9..bb017857 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,9 @@ **/iso/Info /iso +# Custom configs should not be part of JabyEngine +#**/config + .lfsconfig *.d diff --git a/config/DebugColor/jabyengine_custom_config.hpp b/config/DebugColor/jabyengine_custom_config.hpp new file mode 100644 index 00000000..ab418d99 --- /dev/null +++ b/config/DebugColor/jabyengine_custom_config.hpp @@ -0,0 +1,6 @@ +#include "../dummy_default_config.hpp" + +struct CustomConfiguration : public DefaultConfiguration { +}; + +#define __USE_DEBUG_COLOR__ \ No newline at end of file diff --git a/config/MyConfig/jabyengine_custom_config.hpp b/config/MyConfig/jabyengine_custom_config.hpp deleted file mode 100644 index f090936a..00000000 --- a/config/MyConfig/jabyengine_custom_config.hpp +++ /dev/null @@ -1,11 +0,0 @@ -#include "../dummy_default_config.hpp" - -struct CustomConfiguration : public DefaultConfiguration { - struct Test { - static constexpr const char* string() { - return "I am a custom string"; - } - }; -}; - -#define __USE_DEBUG_COLOR__ \ No newline at end of file diff --git a/config/Readme.md b/config/Readme.md new file mode 100644 index 00000000..e69de29b diff --git a/include/PSX/jabyengine_config.hpp b/include/PSX/jabyengine_config.hpp index 2a5cc5c9..023fa364 100644 --- a/include/PSX/jabyengine_config.hpp +++ b/include/PSX/jabyengine_config.hpp @@ -3,12 +3,6 @@ namespace JabyEngine { struct DefaultConfiguration { - struct Test { - static constexpr const char* string() { - return "I am default string"; - } - }; - struct BIOSFont { static constexpr GPU::PositionU16 texture_load_pos() { return GPU::PositionU16::create(320, 256); diff --git a/src/Library/src/BootLoader/start_boot.cpp b/src/Library/src/BootLoader/start_boot.cpp index ce0f2acf..55cc12d5 100644 --- a/src/Library/src/BootLoader/start_boot.cpp +++ b/src/Library/src/BootLoader/start_boot.cpp @@ -3,7 +3,6 @@ #include #include -#include #include #include #include "../../reference/inline_n.h" @@ -145,8 +144,6 @@ namespace JabyEngine { static constexpr auto DebugY = 0; static constexpr auto DebugScale = 1.0; - //TODO: for now v - printf("Config-Str: %s\n", Configuration::Test::string()); __debug_boot_print_at(GPU::Color24::White(), DebugX, DebugY, DebugScale, "Starting Planschbecken\n"); printf("Heap starts @0x%p\n", &__heap_start); printf("BSS from 0x%p to 0x%p (%u)\n", &__bss_start, &__bss_end, __bss_len);