I broke the compiler

2018-10-16 19:11:00 +01:00
parent 5e113daf7b
commit 734c78cdc3
7 changed files with 3 additions and 3 deletions
--- a/ISO/boot/ThanOS
+++ b/ISO/boot/ThanOS
--- a/ISO/boot/grub/grub.cfg
+++ b/ISO/boot/grub/grub.cfg
@@ -1,6 +1,6 @@
 set timeout=0
 set default=0

-menuentry "UrMumOS" {
-   multiboot /boot/kernel
+menuentry "ThanOS" {
+   multiboot /boot/ThanOS
 }
--- a/ISO/boot/kernel
+++ b/ISO/boot/kernel
--- a/bin/ThanOS.bin
+++ b/bin/ThanOS.bin
--- a/bin/ThanOS.iso
+++ b/bin/ThanOS.iso
--- a/kernel.cpp
+++ b/kernel.cpp
@@ -2,7 +2,7 @@
 // Copyright Benjamin Kyd (c) 2018

 int kernel_main(void) {
-    const char* str = "Your mother gay lol";
+    const char* str = "Hello, World!";
    char* videoMemoryPtr = (char*)0xb8000; // Video memory start

    unsigned int i = 0;
--- a/obj/kernel.o
+++ b/obj/kernel.o