From 05e1fedcc9cd30d1a34a65e640da45e980b4f859 Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Thu, 19 Sep 2019 19:56:59 +0200
Subject: Moved source to kernel directory

---
 build.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index 031abc9..1c7de3c 100755
--- a/build.sh
+++ b/build.sh
@@ -9,11 +9,11 @@ rm -rf ./build/ ./iso/
 mkdir ./build/
 
 # Assemble ASM files
-nasm -f elf ./src/boot.asm -o ./build/boot.o
+nasm -f elf ./src/kernel/boot.asm -o ./build/boot.o
 
 # Make all C files
 files=""
-find ./src -name \*.c >./build/tmp
+find ./src/kernel/ -name \*.c >./build/tmp
 while read -r line; do
   stripped=$(echo "${line}" | sed -r 's/\//_/g')
   stripped=${stripped#??????}
@@ -25,7 +25,7 @@ rm ./build/tmp
 
 # shellcheck disable=SC2086
 # Shellcheck suppression is needed because gcc would think that $files is one file
-i686-elf-gcc -T ./src/linker.ld -o ./build/melvix.bin -ffreestanding -O2 -nostdlib ./build/boot.o $files -lgcc
+i686-elf-gcc -T ./src/kernel/linker.ld -o ./build/melvix.bin -ffreestanding -O2 -nostdlib ./build/boot.o $files -lgcc
 
 # Testing
 if grub-file --is-x86-multiboot ./build/melvix.bin; then
@@ -38,7 +38,7 @@ fi
 # Create ISO
 mkdir -p ./iso/boot/grub
 cp ./build/melvix.bin ./iso/boot/
-cp ./src/grub.cfg ./iso/boot/grub/
+cp ./src/kernel/grub.cfg ./iso/boot/grub/
 grub-mkrescue -o ./build/melvix.iso ./iso/
 
 # Run ISO
-- 
cgit v1.2.3