Updated dependencies

This commit is contained in:
lucic71 2022-06-28 19:40:51 +03:00
parent 59d7b06117
commit 641e88ba98
4 changed files with 13 additions and 10 deletions

View File

@ -37,7 +37,7 @@ include $(ARCHDIR)/make.config
# Updated compiler flags with architecture settings added
CFLAGS+=-I$(KERNEL_ARCH_INCLUDE)
CFLAGS+=$(foreach INC, $(KERNEL_ARCH_INCLUDE), -I$(INC))
CFLAGS:=$(CFLAGS) $(KERNEL_ARCH_CFLAGS)
CPPFLAGS:=$(CPPFLAGS) $(KERNEL_ARCH_CPPFLAGS)
LDFLAGS:=$(LDFLAGS) $(KERNEL_ARCH_LDFLAGS)

View File

@ -3,7 +3,7 @@
SRC_DIR := src
OBJ_DIR := obj
ASM_DIR := asm
INCLUDE_DIRS := ../include ./include
INCLUDE_DIRS := ../include ./include ../arch/i386/include
# MOD_OBJ - Module Object. Its name will be the same as the module so it is
# a good idea to automate that.

View File

@ -1,5 +1,5 @@
#include "tables/gdt.h"
#include "tables/a20.h"
#include "i386/gdt.h"
#include "i386/a20.h"
.global _start
@ -183,7 +183,6 @@ kentry:
*/
call kmain
cli
.halt:
jmp .halt

View File

@ -5,10 +5,14 @@ KERNEL_ARCH_LIBS=
KERNEL_ARCH_OBJS=\
$(ARCHDIR)/boot.o \
$(ARCHDIR)/tables/idt.o \
$(ARCHDIR)/tables/idt_flush.o \
$(ARCHDIR)/tables/isr.o \
$(ARCHDIR)/tables/isr_gate.o \
$(ARCHDIR)/dt/idt.o \
$(ARCHDIR)/dt/idt_flush.o \
$(ARCHDIR)/isr/isr.o \
$(ARCHDIR)/isr/isr_gate.o \
$(ARCHDIR)/irq/pic.o \
$(ARCHDIR)/irq/irq.o \
$(ARCHDIR)/irq/irq_gate.o \
KERNEL_ARCH_INCLUDE=\
$(ARCHDIR)/ \
$(ARCHDIR)/include \
lib/include \