From 3833a92d5823f0f54030dedbcadbda4ef8583b41 Mon Sep 17 00:00:00 2001
From: Alexis211 <alexis211@gmail.com>
Date: Sun, 15 Nov 2009 19:33:04 +0100
Subject: Screwy implementation of FATFS::read

---
 Makefile | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 33205ff..98a9dd5 100644
--- a/Makefile
+++ b/Makefile
@@ -63,6 +63,8 @@ floppy: $(Files)
 	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
 	sleep 0.4
 	sudo umount Mount
 
-- 
cgit v1.2.3


From a40fe1166ab1db972a8ca0380d603c4d90eede62 Mon Sep 17 00:00:00 2001
From: Alexis211 <alexis211@gmail.com>
Date: Wed, 25 Nov 2009 18:42:44 +0100
Subject: Re-organized file system stuff.

---
 Makefile | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 98a9dd5..1b7e9b4 100644
--- a/Makefile
+++ b/Makefile
@@ -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 ** "; \
-- 
cgit v1.2.3


From 56ace5efd6ccc02004ddafb1e564a3f9d5d538d2 Mon Sep 17 00:00:00 2001
From: Alexis211 <alexis211@gmail.com>
Date: Fri, 27 Nov 2009 20:43:25 +0100
Subject: Added some screenshots, re-organized some stuff.

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 1b7e9b4..dca520e 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 \
-- 
cgit v1.2.3