Skip to content

Commit b08acf4

Browse files
committed
fixed the header issues
1 parent aed28e5 commit b08acf4

2 files changed

Lines changed: 4 additions & 3 deletions

File tree

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
CC := i686-elf-gcc
22
AS := nasm
3-
LD := i686-elf-gcc
3+
LD := i686-elf-ld
44
OBJCOPY := i686-elf-objcopy
55

66
CFLAGS := -ffreestanding -O2 -Wall -Wextra -m32 -fno-pie -fno-stack-protector -nostdlib -nostdinc -Iinclude -msse -msse2
77
ASFLAGS := -f elf32
8-
LDFLAGS := -T linker.ld -ffreestanding -O2 -nostdlib -Wl,--build-id=none
8+
LDFLAGS := -T linker.ld --build-id=none -m elf_i386
99

1010
SRC_DIR := src
1111
BUILD_DIR := build
@@ -19,7 +19,7 @@ ASM_OBJS := $(patsubst $(SRC_DIR)/%.s,$(BUILD_DIR)/%.o,$(ASM_SRCS))
1919
C_OBJS := $(patsubst $(SRC_DIR)/%.c,$(BUILD_DIR)/%.o,$(C_SRCS))
2020

2121
BOOT_OBJ := $(BUILD_DIR)/boot.o
22-
OTHER_OBJS := $(filter-out $(BOOT_OBJ),$(ASM_OBJS) $(C_OBJS))
22+
OTHER_OBJS := $(sort $(filter-out $(BOOT_OBJ),$(ASM_OBJS) $(C_OBJS)))
2323
OBJS := $(BOOT_OBJ) $(OTHER_OBJS)
2424

2525
ifneq ($(MODEL_BLOB),)

src/video/framebuffer.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include "framebuffer.h"
2+
#include "vga.h"
23
#include "font.h"
34
#include "multiboot.h"
45
#include "ports.h"

0 commit comments

Comments
 (0)