From e9232199bdd97233dabd59f07c63607c93c0c59c Mon Sep 17 00:00:00 2001 From: Aqua-sama Date: Sun, 21 Mar 2021 16:53:07 +0200 Subject: Check multiboot2 header length, and if needed map the next page as well --- makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'makefile') diff --git a/makefile b/makefile index fc3338e..7eecced 100644 --- a/makefile +++ b/makefile @@ -14,7 +14,7 @@ CXX_OBJ := $(addprefix $(OBJ_DIR)/, $(CXX_OBJ)) CXX_DEP = $(CXX_OBJ:%.o=%.d) CXX_TEST_OBJ := $(addprefix $(OBJ_DIR)/, $(CXX_TEST_OBJ)) CXX_INCLUDE := $(addprefix -I, $(CXX_INCLUDE)) -CXX_SYSTEM_INCLUDE := $(addprefix -isystem, $(CXX_SYSTEM_INCLUDE)) +SYSTEM_INCLUDE := $(addprefix -isystem, $(SYSTEM_INCLUDE)) $(OBJ_DIR)/glitch.elf: $(autogen) $(AS_OBJ) $(CXX_OBJ) linker.ld @echo " LD $@" @@ -23,13 +23,13 @@ $(OBJ_DIR)/glitch.elf: $(autogen) $(AS_OBJ) $(CXX_OBJ) linker.ld $(AS_OBJ): $(OBJ_DIR)/%.o: %.S @mkdir -p $(@D) @echo " AS $<" - @$(AS) -target $(TARGET) -nostdlib -Wall -Wextra -c $^ -o $@ + @$(AS) -target $(TARGET) $(AS_FLAGS) $(SYSTEM_INCLUDE) -c $^ -o $@ -include $(CXX_DEP) $(CXX_OBJ): $(OBJ_DIR)/%.o : %.cc @mkdir -p $(@D) @echo " CXX $<" - @$(CXX) -target $(TARGET) $(CXX_FLAGS) $(CXX_INCLUDE) $(CXX_SYSTEM_INCLUDE) -MMD -c $< -o $@ + @$(CXX) -target $(TARGET) $(CXX_FLAGS) $(CXX_INCLUDE) $(SYSTEM_INCLUDE) -MMD -c $< -o $@ $(CXX_TEST_OBJ): $(OBJ_DIR)/%.o : %.cc @mkdir -p $(@D) -- cgit v1.2.1