summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/include/acpi.h (renamed from src/kernel/include/acpi.h)0
-rw-r--r--src/include/libc.h (renamed from src/kernel/include/libc.h)0
-rw-r--r--src/include/paging.h (renamed from src/kernel/include/paging.h)0
-rw-r--r--src/include/printf.h (renamed from src/kernel/include/printf.h)0
-rw-r--r--src/include/serial.h (renamed from src/kernel/include/serial.h)0
-rw-r--r--src/include/video.h (renamed from src/kernel/include/video.h)0
-rwxr-xr-xsrc/indigo_osbin0 -> 15960 bytes
-rw-r--r--src/kernel/acpi.c (renamed from src/kernel/libs/acpi.c)0
-rw-r--r--src/kernel/drivers/serial.c (renamed from src/kernel/libs/drivers/serial.c)0
-rw-r--r--src/kernel/drivers/video.c (renamed from src/kernel/libs/drivers/video.c)0
-rw-r--r--src/kernel/libc.c (renamed from src/kernel/libs/libc.c)0
-rw-r--r--src/kernel/page.c (renamed from src/kernel/libs/page.c)0
-rw-r--r--src/kernel/printf.c (renamed from src/kernel/libs/printf.c)0
-rw-r--r--src/kernel/printf.h (renamed from src/kernel/libs/printf.h)0
-rw-r--r--src/makefile14
15 files changed, 7 insertions, 7 deletions
diff --git a/src/kernel/include/acpi.h b/src/include/acpi.h
index c15e044..c15e044 100644
--- a/src/kernel/include/acpi.h
+++ b/src/include/acpi.h
diff --git a/src/kernel/include/libc.h b/src/include/libc.h
index cdf6dbc..cdf6dbc 100644
--- a/src/kernel/include/libc.h
+++ b/src/include/libc.h
diff --git a/src/kernel/include/paging.h b/src/include/paging.h
index 267da43..267da43 100644
--- a/src/kernel/include/paging.h
+++ b/src/include/paging.h
diff --git a/src/kernel/include/printf.h b/src/include/printf.h
index 6104ccf..6104ccf 100644
--- a/src/kernel/include/printf.h
+++ b/src/include/printf.h
diff --git a/src/kernel/include/serial.h b/src/include/serial.h
index 824e245..824e245 100644
--- a/src/kernel/include/serial.h
+++ b/src/include/serial.h
diff --git a/src/kernel/include/video.h b/src/include/video.h
index 82d3423..82d3423 100644
--- a/src/kernel/include/video.h
+++ b/src/include/video.h
diff --git a/src/indigo_os b/src/indigo_os
new file mode 100755
index 0000000..9c24910
--- /dev/null
+++ b/src/indigo_os
Binary files differ
diff --git a/src/kernel/libs/acpi.c b/src/kernel/acpi.c
index 0c22fe4..0c22fe4 100644
--- a/src/kernel/libs/acpi.c
+++ b/src/kernel/acpi.c
diff --git a/src/kernel/libs/drivers/serial.c b/src/kernel/drivers/serial.c
index 25f89ad..25f89ad 100644
--- a/src/kernel/libs/drivers/serial.c
+++ b/src/kernel/drivers/serial.c
diff --git a/src/kernel/libs/drivers/video.c b/src/kernel/drivers/video.c
index ab73bb0..ab73bb0 100644
--- a/src/kernel/libs/drivers/video.c
+++ b/src/kernel/drivers/video.c
diff --git a/src/kernel/libs/libc.c b/src/kernel/libc.c
index dc5c0ac..dc5c0ac 100644
--- a/src/kernel/libs/libc.c
+++ b/src/kernel/libc.c
diff --git a/src/kernel/libs/page.c b/src/kernel/page.c
index 6f1dd7c..6f1dd7c 100644
--- a/src/kernel/libs/page.c
+++ b/src/kernel/page.c
diff --git a/src/kernel/libs/printf.c b/src/kernel/printf.c
index 14c897d..14c897d 100644
--- a/src/kernel/libs/printf.c
+++ b/src/kernel/printf.c
diff --git a/src/kernel/libs/printf.h b/src/kernel/printf.h
index 6104ccf..6104ccf 100644
--- a/src/kernel/libs/printf.h
+++ b/src/kernel/printf.h
diff --git a/src/makefile b/src/makefile
index 5e8acb7..4e51ff4 100644
--- a/src/makefile
+++ b/src/makefile
@@ -1,7 +1,7 @@
LD=../compiler/indigo_gcc/bin/x86_64-elf-ld
CC=../compiler/indigo_gcc/bin/x86_64-elf-gcc
OBJCPY=../compiler/indigo_gcc/bin/x86_64-elf-objcopy
-INC=-Ikernel/include
+INC=-I./include
EMU_CORES=4
EMU_RAM=4G
@@ -12,12 +12,12 @@ YRES=768
make:
nasm -g -felf64 bootloader/bootloader.asm -o objects/bootloader.o
$(CC) $(INC) -g -ffreestanding -c kernel/kernel.c -o objects/kernel.o
- $(CC) $(INC) -g -ffreestanding -c kernel/libs/acpi.c -o objects/acpi.o
- $(CC) $(INC) -g -ffreestanding -c kernel/libs/drivers/serial.c -o objects/serial.o
- $(CC) $(INC) -g -ffreestanding -c kernel/libs/drivers/video.c -o objects/video.o
- $(CC) $(INC) -g -ffreestanding -c kernel/libs/printf.c -o objects/printf.o
- $(CC) $(INC) -g -ffreestanding -c kernel/libs/page.c -o objects/page.o
- $(CC) $(INC) -g -ffreestanding -c kernel/libs/libc.c -o objects/libc.o
+ $(CC) $(INC) -g -ffreestanding -c kernel/acpi.c -o objects/acpi.o
+ $(CC) $(INC) -g -ffreestanding -c kernel/drivers/serial.c -o objects/serial.o
+ $(CC) $(INC) -g -ffreestanding -c kernel/drivers/video.c -o objects/video.o
+ $(CC) $(INC) -g -ffreestanding -c kernel/printf.c -o objects/printf.o
+ $(CC) $(INC) -g -ffreestanding -c kernel/page.c -o objects/page.o
+ $(CC) $(INC) -g -ffreestanding -c kernel/libc.c -o objects/libc.o
$(LD) -o indigo_os.elf --oformat=elf64-x86-64 -T link.ld
$(OBJCPY) --only-keep-debug indigo_os.elf debug/debug_syms.o
$(OBJCPY) -O binary --strip-all indigo_os.elf indigo_os