shockrah/jankos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

restructuring build setup

Browse Source
This commit is contained in:
shockrahwow 2019-09-12 11:46:41 -07:00
parent b3ef53ccab
commit ee4026a89e
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
framebuffer.c → core/framebuffer.c
View File

0
framebuffer.h → core/framebuffer.h
View File

1
core/kernel.c Normal file
View File

@ -0,0 +1 @@
// Main kernel code (duh)

6
makefile
View File

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