2 files changed, 30 insertions, 14 deletions
diff --git a/kernel/arch/x86_64/make.conf b/kernel/arch/x86_64/make.conf
new file mode 100644
index 0000000..b41be94
--- /dev/null
+++ b/kernel/arch/x86_64/make.conf
@@ -0,0 +1,30 @@
+# Copyright (C) 2025 Danny Holman <dholman@gymli.org>
+# 
+# This file is part of BoxOS, a free and open-source Unix-like operating
+# system.
+# 
+# BoxOS is free software; you can redistribute it and/or modify under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+# 
+# BoxOS is distributed in the hope it will be useful, but WITHOUT ANY WARRANTY;
+# without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE. See the GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License along with
+# BoxOS; if not, see <https://www.gnu.org/licenses/>.
+
+INCLUDE+=-I$(ARCHDIR)/include
+AFLAGS+=-target $(ARCH)-none-elf
+CFLAGS+=-mno-red-zone -mno-mmx -mno-sse -mno-sse2 -target $(ARCH)-none-elf
+LDFLAGS+=--script=$(ARCHDIR)/linker.ld
+
+ARCH_OBJS=$(ARCHDIR)/asm/boot.o \
+          $(ARCHDIR)/asm/isr.o \
+          $(ARCHDIR)/asm/paging.o \
+          $(ARCHDIR)/asm/spinlock.o \
+          $(ARCHDIR)/asm/stack_trace.o \
+          $(ARCHDIR)/asm/switch_thread.o \
+          $(ARCHDIR)/kernel/serial.o \
+          $(ARCHDIR)/kernel/syscall.o \
diff --git a/kernel/arch/x86_64/make.config b/kernel/arch/x86_64/make.config
deleted file mode 100644
index 2347ce2..0000000
--- a/kernel/arch/x86_64/make.config
+++ /dev/null
@@ -1,14 +0,0 @@
-KERNEL_ARCH_INCLUDE=-I$(ARCHDIR)/include
-KERNEL_ARCH_CFLAGS=$(SYS_CFLAGS) -mno-red-zone -mno-mmx -mno-sse -mno-sse2
-KERNEL_ARCH_LDFLAGS=
-KERNEL_ARCH_LIBS=
-
-KERNEL_ARCH_OBJS=$(ARCHDIR)/asm/boot.o \
-                 $(ARCHDIR)/asm/isr.o \
-                 $(ARCHDIR)/asm/paging.o \
-                 $(ARCHDIR)/asm/spinlock.o \
-                 $(ARCHDIR)/asm/stack_trace.o \
-                 $(ARCHDIR)/asm/switch_thread.o \
-                 $(ARCHDIR)/kernel/serial.o \
-                 $(ARCHDIR)/kernel/syscall.o \
-                 $(ARCHDIR)/mem/gdt.o \