From 432f79d1749492a21d1d64d8b731dc2638d084cc Mon Sep 17 00:00:00 2001 From: mintsuki Date: Sat, 25 Feb 2023 12:00:07 +0100 Subject: [PATCH] Update --- LICENSE.md => LICENSE | 2 +- kernel/GNUmakefile | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) rename LICENSE.md => LICENSE (92%) diff --git a/LICENSE.md b/LICENSE similarity index 92% rename from LICENSE.md rename to LICENSE index 25feedf..cd4e243 100644 --- a/LICENSE.md +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright 2020, 2021 mintsuki and contributors. +Copyright (C) 2023 mintsuki and contributors. Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted. diff --git a/kernel/GNUmakefile b/kernel/GNUmakefile index af3fb78..cdd4273 100644 --- a/kernel/GNUmakefile +++ b/kernel/GNUmakefile @@ -49,9 +49,12 @@ override CFLAGS += \ -mno-sse \ -mno-sse2 \ -mno-red-zone \ - -mcmodel=kernel \ - -MMD \ - -I. + -mcmodel=kernel + +override CPPFLAGS := \ + -I. \ + $(CPPFLAGS) \ + -MMD # Internal linker flags that should not be changed by the user. override LDFLAGS += \ @@ -93,11 +96,11 @@ $(KERNEL): $(OBJ) # Compilation rules for *.c files. %.o: %.c limine.h - $(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@ + $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ # Compilation rules for *.S files. %.o: %.S limine.h - $(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@ + $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ # Compilation rules for *.asm (nasm) files. %.o: %.asm