Fix: framebuffer draw_char

makefile

@@ -9,24 +9,29 @@ KERNEL_DIR = $(SRC_DIR)/kernel
 LIBC_DIR = $(SRC_DIR)/libc
 PROGRAMS_DIR = $(SRC_DIR)/programs
 DRIVERS_DIR = $(SRC_DIR)/drivers
+INCLUDE_DIR = include
+FONTS_DIR = $(INCLUDE_DIR)/fonts
 OBJ_DIR = build
 
 C_SOURCES = $(wildcard $(KERNEL_DIR)/*.c) $(wildcard $(LIBC_DIR)/*.c) $(wildcard $(PROGRAMS_DIR)/*.c) $(wildcard $(DRIVERS_DIR)/*.c)
 ASM_SOURCES = $(wildcard $(KERNEL_DIR)/*.s) $(wildcard $(LIBC_DIR)/*.s) $(wildcard $(PROGRAMS_DIR)/*.s) $(wildcard $(DRIVERS_DIR)/*.s)
 
-OBJECTS = $(patsubst $(SRC_DIR)/%, $(OBJ_DIR)/%, $(C_SOURCES:.c=.o) $(ASM_SOURCES:.s=.o))
+OBJECTS = $(patsubst $(SRC_DIR)/%, $(OBJ_DIR)/%, $(C_SOURCES:.c=.o) $(ASM_SOURCES:.s=.o)) 
 
 TOOLCHAIN_SRC = https://newos.org/toolchains/i386-elf-7.5.0-Linux-x86_64.tar.xz
 TOOLCHAIN_FILE = i386-elf-7.5.0-Linux-x86_64.tar.xz
 
+FONT_OBJ = $(OBJ_DIR)/fonts/UniCyr_8x16.o
+FONT_SRC = $(FONTS_DIR)/UniCyr_8x16.psf
+
 all: $(OBJ_DIR) kernel.elf
 
 $(OBJ_DIR):
 	mkdir -p $(OBJ_DIR)
-	mkdir -p $(OBJ_DIR)/kernel $(OBJ_DIR)/libc $(OBJ_DIR)/programs $(OBJ_DIR)/drivers
+	mkdir -p $(OBJ_DIR)/kernel $(OBJ_DIR)/libc $(OBJ_DIR)/programs $(OBJ_DIR)/drivers $(OBJ_DIR)/fonts
 
-kernel.elf: $(OBJECTS)
-	ld $(LDFLAGS) $(OBJECTS) -o kernel.elf
+kernel.elf: $(OBJECTS) $(FONT_OBJ)
+	ld $(LDFLAGS) $(OBJECTS) $(FONT_OBJ) -o kernel.elf
 
 $(OBJ_DIR)/%.o: $(SRC_DIR)/%.c
 	$(CC) $(CFLAGS) $< -o $@
@@ -34,6 +39,12 @@ $(OBJ_DIR)/%.o: $(SRC_DIR)/%.c
 $(OBJ_DIR)/%.o: $(SRC_DIR)/%.s
 	$(AS) $(ASFLAGS) $< -o $@
 
+$(FONT_OBJ): $(FONT_SRC) | $(OBJ_DIR)/fonts
+	objcopy -O elf32-i386 -B i386 -I binary $(FONT_SRC) $(FONT_OBJ)
+
+$(OBJ_DIR)/fonts:
+	mkdir -p $(OBJ_DIR)/fonts
+
 toolchain:
 	wget $(TOOLCHAIN_SRC)
 	tar xf $(TOOLCHAIN_FILE)
@@ -52,3 +63,4 @@ debug:
 
 clean:
 	rm -rf $(OBJ_DIR) kernel.elf blankos.iso $(TOOLCHAIN_FILE)
+