aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMarvin Borner2019-11-22 22:17:54 +0100
committerMarvin Borner2019-11-22 22:17:54 +0100
commit4b178c0feb4c415be36be0e4c0def8c447ed42af (patch)
tree694f0226b419ec5b043830e12f96aa5e09c9305f /Makefile
parent0ba991750314310a5e53b0d8135aef5b1352b261 (diff)
Added the most awesome c lib
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 81229f0..9ebee6c 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ build: clean
nasm -f elf ./src/kernel/boot.asm -o ./build/boot.o || exit; \
# Make all C files
- find ./src/kernel/ ./src/userspace/ -name \*.c >./build/tmp; \
+ find ./src/kernel/ ./src/userspace/ ./src/mlibc/ -name \*.c >./build/tmp; \
while read -r line; do \
stripped=$$(echo "$${line}" | sed -r 's/\//_/g'); \
stripped=$${stripped#??????}; \
@@ -69,7 +69,7 @@ debug:
@echo "Starting simulation"
@echo "[SERIAL OUTPUT]"
@head -c 10485760 /dev/zero > ./build/hdd10M.img
- @qemu-system-x86_64 -no-reboot -M accel=kvm:tcg -vga std -serial stdio -rtc base=localtime -d int,in_asm -D qemu.log -m 512M -cdrom ./build/melvix.iso -hda ./build/hdd10M.img
+ @qemu-system-x86_64 -no-reboot -M accel=kvm:tcg -vga std -serial stdio -rtc base=localtime -d int,in_asm -D qemu.log -m 128M -cdrom ./build/melvix.iso -hda ./build/hdd10M.img
@echo "[END OF CONNECTION]"
.PHONY: build clean cross test debug \ No newline at end of file