diff options
| author | trimill <trimill@trimillxyz.org> | 2024-01-31 21:26:55 -0500 |
|---|---|---|
| committer | trimill <trimill@trimillxyz.org> | 2024-01-31 21:26:55 -0500 |
| commit | 7a59ef37b8ea45557565bddb57048309a574acff (patch) | |
| tree | 280edb15c630f4ae9d16c2ec284dee4aa1cd474d | |
| parent | reorganize, add sym_lookup (diff) | |
| download | corn-7a59ef37b8ea45557565bddb57048309a574acff.tar.gz corn-7a59ef37b8ea45557565bddb57048309a574acff.tar.bz2 corn-7a59ef37b8ea45557565bddb57048309a574acff.zip | |
undo bad decisions
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | grub.cfg (renamed from arch/amd64/grub.cfg) | 0 |
2 files changed, 4 insertions, 4 deletions
@@ -11,7 +11,7 @@ LD=ld 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 +LDFLAGS+=-nmagic C_SRC=$(shell find $(SRC_DIR) -type f -name "*.c") C_OBJ=$(patsubst %.c,$(BUILD_DIR)/%.o,$(C_SRC)) @@ -37,14 +37,14 @@ $(C_OBJ): $(BUILD_DIR)/%.o : %.c @mkdir -p $(@D) $(CC) -c $(CFLAGS) -o $@ $< -$(BUILD_DIR)/$(K_BIN_NAME): $(SRC_DIR)/arch/amd64/linker.ld $(A_OBJ) $(C_OBJ) $(H_SRC) $(H_INCLUDE) +$(BUILD_DIR)/$(K_BIN_NAME): arch/amd64/linker.ld $(A_OBJ) $(C_OBJ) $(H_SRC) $(H_INCLUDE) @mkdir -p $(@D) - $(LD) $(LDFLAGS) -o $(BUILD_DIR)/$(K_BIN_NAME) $(A_OBJ) $(C_OBJ) + $(LD) $(LDFLAGS) -T arch/amd64/linker.ld -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 arch/amd64/grub.cfg $(BUILD_DIR)/iso/boot/grub + cp 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 diff --git a/arch/amd64/grub.cfg b/grub.cfg index 3aa3a12..3aa3a12 100644 --- a/arch/amd64/grub.cfg +++ b/grub.cfg |