make hell
This commit is contained in:
parent
c8ab919c11
commit
60d7e2d421
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
|||||||
*.o
|
obj
|
||||||
|
18
Makefile
18
Makefile
@ -1,15 +1,9 @@
|
|||||||
SRC=$(wildcard src/*.c)
|
include sys/Makefile
|
||||||
BOOT=$(wildcard boot/*.s)
|
CC=cc
|
||||||
INCLUDE=include/
|
|
||||||
FLAGS=-g -Wall -Wextra -Ffreestanding -m32
|
|
||||||
BIN=boot.img
|
|
||||||
|
|
||||||
all: boot
|
|
||||||
$(CC) $(FLAGS) $(SRC) -I $(INCLUDE) -o $(BIN)
|
|
||||||
|
|
||||||
boot:
|
all: vga.o
|
||||||
nasm -Fl32
|
$(CC) sys/drv/vga/vga.o
|
||||||
|
|
||||||
install: all
|
|
||||||
./installgrub.sh
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
1
sys/Makefile
Normal file
1
sys/Makefile
Normal file
@ -0,0 +1 @@
|
|||||||
|
include drv/vga/Makefile
|
@ -3,7 +3,7 @@ FLAGS=-Wall -c -g -Wextra -ffreestanding -m32 -nostdlib
|
|||||||
SRCS=$(wildcard *.c)
|
SRCS=$(wildcard *.c)
|
||||||
INCLUDE=include/
|
INCLUDE=include/
|
||||||
MAIN_INCLUDE=../../include/
|
MAIN_INCLUDE=../../include/
|
||||||
BIN=vga.o
|
BIN=../../../obj/drv/vga.o
|
||||||
|
|
||||||
all:
|
all:
|
||||||
$(CC) $(FLAGS) -I $(INCLUDE) -I $(MAIN_INCLUDE) $(SRCS) -o $(BIN)
|
$(CC) $(FLAGS) -I $(INCLUDE) -I $(MAIN_INCLUDE) $(SRCS) -o $(BIN)
|
||||||
|
Binary file not shown.
@ -17,6 +17,6 @@ vga_write(s8 *sequence, s8 flags)
|
|||||||
|
|
||||||
void vga_clearscreen() {
|
void vga_clearscreen() {
|
||||||
for (int i = 0; i <= SIZE; i++) {
|
for (int i = 0; i <= SIZE; i++) {
|
||||||
VGA_START[i] = 0;
|
vga_vidmem[i] = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user