Structure:

renamed .asm files to .s extension

Makefile:
	Building .s first over

Bochs conf:
	changed display server to x instead of sdl

Changed function defs to not have the parameter names for less confusion
This commit is contained in:
shockrah
2019-09-14 23:42:49 -07:00
parent b3ef53ccab
commit c8851baea6
7 changed files with 18 additions and 21 deletions

View File

@@ -3,7 +3,7 @@ ASM=nasm
LINK=ld
ISO=genisoimage
OBJECTS=loader.o framebuffer.o
OBJECTS=loader.o framebuffer.o io.o
AFLAGS=-f elf32
CFLAGS=-m32 -nostdlib -nostdinc -fno-builtin -fno-stack-protector -nostartfiles \
-nodefaultlibs -Wall -Wextra -Werror -c
@@ -28,14 +28,14 @@ os.iso: kernel.elf
-o os.iso \
iso
# Builind asm objects
%.o: %.s
$(ASM) $(AFLAGS) $< -o $@
# Building C objecets
%.o: %.c
$(CC) $(CFLAGS) $< -o $@
# Builind asm objects
%.o: %.asm
$(ASM) $(AFLAGS) $< -o $@
# Running (no recipes called)
run: os.iso
bochs -f bochsrc.conf -q