aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarvin Borner2019-11-30 13:25:52 +0100
committerMarvin Borner2019-11-30 13:25:52 +0100
commit348995b3fb8e1ce4a01eeb1f2189e664e833b69d (patch)
tree100e4c3d586e1af9674f4829a533bcf2f34ea40b
parent728d764f314b98adec26d8e674b7235db6c4ad63 (diff)
Renamed assets directory
-rw-r--r--Makefile2
-rwxr-xr-xsrc/resources/conv.sh (renamed from src/kernel/graphics/conv.sh)0
-rw-r--r--src/resources/font.c (renamed from src/assets/font.c)0
3 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 7df77b6..8e61cb8 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ build: clean
i686-elf-gcc -T ./src/kernel/linker.ld -I ./src -o ./build/melvix.bin -std=gnu99 -ffreestanding -O2 -nostdlib ./build/*.o || exit; \
# Modules
- i686-elf-gcc -c ./src/assets/font.c -o ./build/font.o -I ./src -std=gnu99 -ffreestanding -O2 -nostdlib; \
+ i686-elf-gcc -c ./src/resources/font.c -o ./build/font.o -I ./src -std=gnu99 -ffreestanding -O2 -nostdlib; \
objcopy -O binary ./build/font.o ./build/font.bin; \
rm ./build/font.o; \
diff --git a/src/kernel/graphics/conv.sh b/src/resources/conv.sh
index ff922dd..ff922dd 100755
--- a/src/kernel/graphics/conv.sh
+++ b/src/resources/conv.sh
diff --git a/src/assets/font.c b/src/resources/font.c
index 02699d4..02699d4 100644
--- a/src/assets/font.c
+++ b/src/resources/font.c