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:
10
makefile
10
makefile
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user