summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Source/Kernel/Config.h12
-rw-r--r--Source/Kernel/Core/kmain.wtf.cpp6
2 files changed, 14 insertions, 4 deletions
diff --git a/Source/Kernel/Config.h b/Source/Kernel/Config.h
index 40689e3..5f9f81a 100644
--- a/Source/Kernel/Config.h
+++ b/Source/Kernel/Config.h
@@ -1,9 +1,19 @@
#ifndef DEF_MELON_KERNEL_CONFIG
#define DEF_MELON_KERNEL_CONFIG
+//Undefine if you don't want debugging. This doesn't really do anything
#define OPT_DEBUG
-//Color scheme
+//******************************
+// General options
+// *********************************
+#define DEFAULT_INIT "/System/Applications/PaperWork.app"
+#define DEFAULT_ROOT "ramfs:0"
+#define DEFAULT_ENABLEVESA true //enable VESA by default ?
+
+//******************************
+// Color scheme
+// *********************************
#define TXTLOGO_FGCOLOR 9 //Colors for the melon logo
#define TXTLOGO_BGCOLOR 0
diff --git a/Source/Kernel/Core/kmain.wtf.cpp b/Source/Kernel/Core/kmain.wtf.cpp
index bd19e8c..fd69f39 100644
--- a/Source/Kernel/Core/kmain.wtf.cpp
+++ b/Source/Kernel/Core/kmain.wtf.cpp
@@ -112,10 +112,10 @@ void kmain(multiboot_info_t* mbd, u32int magic) {
SB::progress("Parse command line");
Vector<String> opts = kcmdline.split(" ");
- String keymap = "builtin", init = "/System/Applications/PaperWork.app";
- String root = "ramfs:0";
+ String keymap = "builtin", init = DEFAULT_INIT;
+ String root = DEFAULT_ROOT;
Vector<String> mount;
- bool enableVESA = true;
+ bool enableVESA = DEFAULT_ENABLEVESA;
for (u32int i = 0; i < opts.size(); i++) {
Vector<String> opt = opts[i].split(":");
if (opt[0] == "vesa" && opt[1] != "enabled") enableVESA = false;