Skip to content

Commit f04e232

Browse files
Improved makefile, removed disk.txt.
1 parent ee1bee0 commit f04e232

File tree

2 files changed

+14
-10
lines changed

2 files changed

+14
-10
lines changed

Makefile

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
all:
1+
iso:
22
@rm -rf ./disk_root
33
@mkdir -p disk_root
44
@cp -v \
@@ -42,39 +42,42 @@ run-x86:
4242
-m 512 \
4343
-no-reboot
4444

45-
run-x86-uefi:
45+
run-x86-hdd:
4646
@qemu-system-x86_64 \
47-
-bios ./firmware/uefi/tianocore-64.uefi \
4847
-vga std \
4948
-debugcon stdio \
5049
-serial file:serial.log \
5150
-audiodev pa,id=speaker \
5251
-device rtl8139,netdev=eth0 \
5352
-netdev user,hostfwd=tcp::5555-:22,id=eth0 \
54-
-cdrom FrostWing.iso \
53+
-hda FrostWing.img \
5554
-drive id=disk,file=disk.txt,if=none \
5655
-device ahci,id=ahci \
5756
-device ide-hd,drive=disk,bus=ahci.0 \
5857
-m 512 \
5958
-no-reboot
6059

61-
run-x86-vnc:
60+
run-x86-uefi:
6261
@qemu-system-x86_64 \
62+
-bios ./firmware/uefi/tianocore-64.uefi \
6363
-vga std \
6464
-debugcon stdio \
6565
-serial file:serial.log \
66+
-audiodev pa,id=speaker \
6667
-device rtl8139,netdev=eth0 \
6768
-netdev user,hostfwd=tcp::5555-:22,id=eth0 \
6869
-cdrom FrostWing.iso \
69-
-m 128 \
70-
-no-reboot \
71-
-vnc :1 -display none &
70+
-drive id=disk,file=disk.txt,if=none \
71+
-device ahci,id=ahci \
72+
-device ide-hd,drive=disk,bus=ahci.0 \
73+
-m 512 \
74+
-no-reboot
7275

7376
everything:
74-
@make clean all -C source && make all tarball run-x86
77+
@make clean all -C source && make iso tarball run-x86
7578

7679
everything-sign:
77-
@make clean all -C source && make sign-kernel && make all tarball run-x86
80+
@make clean all -C source && make sign-kernel && make iso tarball run-x86
7881

7982
doxygen:
8083
# I coded this for my use but you can you can use it, if you know why I have this.
@@ -94,6 +97,7 @@ fonts:
9497
sfnconv -U -B 40 -t b1 ~/Downloads/FiraSans-Regular.ttf ~/Desktop/FrostWing/source/boot/Vera.sfn
9598

9699
top-clean:
100+
@rm -rf ./disk_root
97101
@rm -rf FrostWing.iso
98102
@rm -rf FrostWing.iso.sha256
99103
@rm -rf FrostWing.iso.tar.gz

disk.txt

-512 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)