summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile31
1 files changed, 20 insertions, 11 deletions
diff --git a/Makefile b/Makefile
index 235da20..58bdf13 100644
--- a/Makefile
+++ b/Makefile
@@ -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 \
@@ -50,31 +51,39 @@ mrproper:
commit: mrproper
git add .
- git commit -a
+ git commit -a; exit 0
git push github
git push home
$(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: floppy
- 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 ** "; \