diff options
| author | Alexis211 <alexis211@gmail.com> | 2009-11-29 12:30:07 +0100 |
|---|---|---|
| committer | Alexis211 <alexis211@gmail.com> | 2009-11-29 12:30:07 +0100 |
| commit | 74dea7d492d6d352bfacb147b1c08ad0cf0a8b29 (patch) | |
| tree | f613c8395b75a68e51d69c24eb3acdb0816ad509 /Makefile | |
| parent | d3e4ef59cbb45f02e07fe17fb7c58cba3c737900 (diff) | |
| parent | a913d4c2cb4daf10c0eac4d548fccb26b2a9f099 (diff) | |
| download | Melon-74dea7d492d6d352bfacb147b1c08ad0cf0a8b29.tar.gz Melon-74dea7d492d6d352bfacb147b1c08ad0cf0a8b29.zip | |
Merge branch 'mountpoints' of github.com:Alexis211/Melon into mountpoints
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 29 |
1 files changed, 19 insertions, 10 deletions
@@ -5,7 +5,7 @@ Projects = Kernel Library Tools/MakeRamFS Applications/Shell Applications/PaperW Kernel = Source/Kernel/Melon.ke RamFS = Init.rfs RamFSFiles = :/System :/System/Applications :/System/Configuration :/System/Keymaps \ - :/Applications :/Applications/Demos :/Applications/Shell \ + :/Applications :/Applications/Demos :/Applications/Shell :/Mount \ Source/Kernel/Ressources/Configuration/Users:/System/Configuration/Users \ Source/Kernel/Ressources/Configuration/Groups:/System/Configuration/Groups \ Source/Kernel/Ressources/Keymaps/fr.mkm:/System/Keymaps/fr.mkm \ @@ -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,24 +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 ./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 ** "; \ |