aboutsummaryrefslogtreecommitdiff
path: root/run
diff options
context:
space:
mode:
authorMarvin Borner2020-07-15 22:56:19 +0200
committerMarvin Borner2020-07-15 22:56:19 +0200
commit98557424d956bb8a93a98340720bdbe3017cc04a (patch)
tree49eeb2e22a34ce207cea53832d8f201916e87290 /run
parent0eb09c66a1cd25df53fffad4b0503e3f05cfd4f7 (diff)
this very much good be
Diffstat (limited to 'run')
-rwxr-xr-xrun7
1 files changed, 5 insertions, 2 deletions
diff --git a/run b/run
index 2cd64c1..8a53630 100755
--- a/run
+++ b/run
@@ -89,7 +89,7 @@ make_cross() {
}
make_build() {
- rm -rf ./disk/bin/ ./disk/
+ rm -rf disk/bin/ disk/
mkdir -p build/ disk/bin/ disk/
echo "Building..."
@@ -98,8 +98,11 @@ make_build() {
make
cd ..
- # Copy files
+ # Assemble bootloader
nasm src/entry.asm -f bin -o disk/boot.bin
+
+ # Make kernel binary
+ objcopy -O binary build/melvix.o build/melvix.bin
cp build/melvix.bin disk/
# Create disk image