From f3a04aebab9a936bb076e29ed266477614d48fd9 Mon Sep 17 00:00:00 2001
From: Jacob McDonnell <jacob@jacobmcdonnell.com>
Date: Sun, 8 Jun 2025 15:16:38 -0400
Subject: Limine submodule

---
 .gitmodules             | 4 ++++
 limine                  | 2 +-
 makefile                | 7 ++++---
 source/LimineRequests.c | 1 -
 source/LimineRequests.h | 2 +-
 source/main.c           | 2 +-
 6 files changed, 11 insertions(+), 7 deletions(-)
 create mode 100644 .gitmodules

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..e01f583
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,4 @@
+[submodule "limine"]
+	path = limine
+	url = https://github.com/limine-bootloader/limine.git
+	branch = v9.x-binary
diff --git a/limine b/limine
index 7d2bf77..39e685c 160000
--- a/limine
+++ b/limine
@@ -1 +1 @@
-Subproject commit 7d2bf778c27067ba421e95154208c8b0f3bbf10f
+Subproject commit 39e685c3695cc373a5859ebf14106c924b0c5ece
diff --git a/makefile b/makefile
index fef52a2..78e0fbd 100644
--- a/makefile
+++ b/makefile
@@ -30,7 +30,7 @@ CFLAGS    = -Wall \
             -mno-sse \
             -mno-sse2 \
             -mno-red-zone \
-            -I src \
+            -I limine \
             -DLIMINE_API_REVISION=3 \
             -MMD \
             -MP \
@@ -46,7 +46,6 @@ NASMFLAGS = -Wall -f elf64
 .PHONY: all clean run
 all: $(ISO)
 
-
 $(BIN_DIR) $(OBJ_DIR) $(ISO_ROOT):
 	mkdir $@
 
@@ -62,7 +61,8 @@ $(OBJ_DIR)/%.S.o: $(SRC_DIR)/%.S | $(OBJ_DIR)
 $(OBJ_DIR)/%.asm.o: $(SRC_DIR)/%.asm | $(OBJ_DIR)
 	nasm $(NASMFLAGS) $< -o $@
 
-$(ISO): $(BIN) | $(ISO_ROOT)
+$(ISO): limine $(BIN) | $(ISO_ROOT)
+	make -C limine
 	mkdir -p $(ISO_ROOT)/boot/limine
 	cp -v $(BIN) $(ISO_ROOT)/boot/
 	cp -v limine.conf limine/limine-bios.sys limine/limine-bios-cd.bin \
@@ -82,4 +82,5 @@ run: $(ISO)
 
 clean:
 	rm -rf $(BIN_DIR) $(OBJ_DIR) $(ISO) $(ISO_ROOT)
+	make -C limine clean
 
diff --git a/source/LimineRequests.c b/source/LimineRequests.c
index a3b9bd5..88f2e06 100644
--- a/source/LimineRequests.c
+++ b/source/LimineRequests.c
@@ -1,5 +1,4 @@
 #include <stdint.h>
-#include <limine.h>
 #include "LimineRequests.h"
 
 __attribute__((used, section(".limine_requests_start")))
diff --git a/source/LimineRequests.h b/source/LimineRequests.h
index 45da613..712c2ed 100644
--- a/source/LimineRequests.h
+++ b/source/LimineRequests.h
@@ -2,7 +2,7 @@
 #define LIMINEREQUESTS_H_
 
 #include <stdint.h>
-#include <limine.h>
+#include "limine.h"
 
 extern struct limine_stack_size_request stackSizeRequest;
 extern struct limine_framebuffer_request framebufferRequest;
diff --git a/source/main.c b/source/main.c
index 316274f..f847f1c 100644
--- a/source/main.c
+++ b/source/main.c
@@ -1,5 +1,5 @@
 #include <stddef.h>
-#include <limine.h>
+#include "limine.h"
 #include "LimineRequests.h"
 #include "memory.h"
 
-- 
cgit v1.2.3