From 7ce0cd6056fe9cc583de3f9555699e274ad7ff9a Mon Sep 17 00:00:00 2001 From: trimill Date: Wed, 31 Jan 2024 21:19:22 -0500 Subject: reorganize, add sym_lookup --- Makefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 4e9993d..f976538 100644 --- a/Makefile +++ b/Makefile @@ -8,8 +8,10 @@ ISO_NAME=os_image.iso CC=cc LD=ld -CFLAGS=-std=c2x -ffreestanding -fno-stack-protector -g -Wall -Wextra -pedantic -lgcc -isystem $(INCLUDE_DIR) -CFLAGS+= -DPAGE_SIZE=4096 +CFLAGS+=-std=c2x -ffreestanding -fno-stack-protector -g -Wall -Wextra -pedantic -lgcc -isystem $(INCLUDE_DIR) +CFLAGS+=-DPAGE_SIZE=4096 + +LDFLAGS+=-nmagic -T arch/amd64/linker.ld C_SRC=$(shell find $(SRC_DIR) -type f -name "*.c") C_OBJ=$(patsubst %.c,$(BUILD_DIR)/%.o,$(C_SRC)) @@ -37,12 +39,12 @@ $(C_OBJ): $(BUILD_DIR)/%.o : %.c $(BUILD_DIR)/$(K_BIN_NAME): $(SRC_DIR)/arch/amd64/linker.ld $(A_OBJ) $(C_OBJ) $(H_SRC) $(H_INCLUDE) @mkdir -p $(@D) - $(LD) -nmagic -o $(BUILD_DIR)/$(K_BIN_NAME) -T $(SRC_DIR)/arch/amd64/linker.ld $(A_OBJ) $(C_OBJ) + $(LD) $(LDFLAGS) -o $(BUILD_DIR)/$(K_BIN_NAME) $(A_OBJ) $(C_OBJ) $(BUILD_DIR)/$(ISO_NAME): $(BUILD_DIR)/$(K_BIN_NAME) grub.cfg @mkdir -p $(@D) @mkdir -p $(BUILD_DIR)/iso/boot/grub - cp grub.cfg $(BUILD_DIR)/iso/boot/grub + cp arch/amd64/grub.cfg $(BUILD_DIR)/iso/boot/grub cp $(BUILD_DIR)/$(K_BIN_NAME) $(BUILD_DIR)/iso/boot grub-mkrescue -o $(BUILD_DIR)/$(ISO_NAME) $(BUILD_DIR)/iso -- cgit v1.2.3-freya