diff options
| author | Alexis211 <alexis211@gmail.com> | 2009-11-25 18:42:44 +0100 |
|---|---|---|
| committer | Alexis211 <alexis211@gmail.com> | 2009-11-25 18:42:44 +0100 |
| commit | a40fe1166ab1db972a8ca0380d603c4d90eede62 (patch) | |
| tree | f92c2c02d9d78d68f7c116dff9ac508895f757af /Makefile | |
| parent | f367fe4e5a7712bafc121ce5c228f15e90fc5c93 (diff) | |
| download | Melon-a40fe1166ab1db972a8ca0380d603c4d90eede62.tar.gz Melon-a40fe1166ab1db972a8ca0380d603c4d90eede62.zip | |
Re-organized file system stuff.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 29 |
1 files changed, 18 insertions, 11 deletions
@@ -21,6 +21,7 @@ RamFSFiles = :/System :/System/Applications :/System/Configuration :/System/Keym Files = $(Kernel) $(RamFS) Floppy = Melon.img +HDD = HDD.img all: for p in $(Projects); do \ @@ -56,26 +57,32 @@ commit: mrproper $(RamFS): Source/Tools/MakeRamFS/MakeRamFS $(RamFS) $(RamFSFiles) -floppy: $(Files) +$(Floppy): $(Files) mkdir Mount; exit 0 sudo mount $(Floppy) Mount -o loop - sudo cp Grub-menu.cfg Mount/boot/menu.cfg - for f in $(Files); do \ - sudo cp $$f Mount; \ - done - sudo cp Source/Applications/Demos/GOL Mount/GOL.app - sudo cp Source/Applications/Demos/asmdemo Mount/ASM.dem + sudo ./CopyToFDD.sh sleep 0.4 sudo umount Mount -bochs: +$(HDD): $(Kernel) + mkdir Mount; exit 0 + sudo losetup -o 32256 /dev/loop3 $(HDD) + sudo mount /dev/loop3 Mount + sudo ./CopyToHDD.sh + sudo umount /dev/loop3 + sudo losetup -d /dev/loop3 + +bochs: $(Floppy) bochs -f Bochs.cfg -qemu: - qemu -fda $(Floppy) -m 16 +qemu: $(Floppy) + qemu -fda $(Floppy) -hda $(HDD) -boot a -m 16 + +qemu-hdd: $(HDD) + qemu -fda $(Floppy) -hda $(HDD) -boot c -m 16 qemu_debug: - qemu -fda $(Floppy) -m 16 -s -S & gdb Source/Kernel/Melon.ke -x Qemu-GDB-Debug-CMD + qemu -fda $(Floppy) -hda $(HDD) -boot a -m 16 -s -S & gdb Source/Kernel/Melon.ke -x Qemu-GDB-Debug-CMD stats: echo; echo " ** Statistics for project O3S ** "; \ |