diff options
| author | Marvin Borner | 2019-09-21 12:12:17 +0200 |
|---|---|---|
| committer | Marvin Borner | 2019-09-21 12:14:03 +0200 |
| commit | f18d636a8a147a3e2a72318dc6ab2b0d3c7fd6e0 (patch) | |
| tree | 622de1723722480e81a9f34f96e8a3b90f729df9 | |
| parent | ab431f761e9a0921a2e5b143d07819ddbbfead06 (diff) | |
Improved build process
| -rw-r--r-- | Makefile | 3 | ||||
| -rwxr-xr-x | build.sh | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..2010495 --- /dev/null +++ b/Makefile @@ -0,0 +1,3 @@ +all: + sh cross.sh + sh build.sh
\ No newline at end of file @@ -9,7 +9,7 @@ rm -rf ./build/ ./iso/ mkdir ./build/ # Assemble ASM files -nasm -f elf ./src/kernel/boot.asm -o ./build/boot.o +nasm -f elf ./src/kernel/boot.asm -o ./build/boot.o || exit # Make all C files files="" @@ -18,14 +18,14 @@ while read -r line; do stripped=$(echo "${line}" | sed -r 's/\//_/g') stripped=${stripped#??????} stripped=${stripped%%?}o - i686-elf-gcc -c ./"${line}" -o ./build/"${stripped}" -std=gnu99 -ffreestanding -O2 -Wall -Wextra + i686-elf-gcc -c ./"${line}" -o ./build/"${stripped}" -std=gnu99 -ffreestanding -O2 -Wall -Wextra || exit files="${files} ./build/${stripped}" done <./build/tmp rm ./build/tmp # shellcheck disable=SC2086 # Shellcheck suppression is needed because gcc would think that $files is one file -i686-elf-gcc -T ./src/kernel/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 || exit # Testing if grub-file --is-x86-multiboot ./build/melvix.bin; then |