From 7dc8c19f7d6220c9e3dac43796faf77c4f11974f Mon Sep 17 00:00:00 2001 From: Alexis211 Date: Sat, 17 Oct 2009 23:22:41 +0200 Subject: Melon now loads a simple ASM application out of the ramfs The format is very simple, but an ELF loader is planned. --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 9a7d72a..508aa76 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,13 @@ .PHONY: clean, mrproper, Init.rfs -Projects = Kernel Tools/MakeRamFS +Projects = Kernel Tools/MakeRamFS Applications/ASMApps Kernel = Source/Kernel/Melon.ke RamFS = Init.rfs RamFSFiles = :/System :/System/Applications :/System/Configuration :/System/Keymaps \ Source/Kernel/Ressources/Keymaps/fr.mkm:/System/Keymaps/fr.mkm \ Source/Kernel/Ressources/Texts/Welcome.txt:/Welcome.txt \ + Source/Applications/ASMApps/test:/System/Applications/Test \ :/Useless \ Source/Kernel/Ressources/Texts/Info.txt:/Useless/Info.txt \ Source/Kernel/Ressources/Graphics/logo.text.cxd:/Useless/Melon-logo -- cgit v1.2.3 From bc2eccdd11c27029096fb3e891073503eb269e27 Mon Sep 17 00:00:00 2001 From: Alexis211 Date: Sun, 18 Oct 2009 12:35:07 +0200 Subject: We can now load ELF binaries !!! --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 508aa76..324deb7 100644 --- a/Makefile +++ b/Makefile @@ -1,13 +1,13 @@ .PHONY: clean, mrproper, Init.rfs -Projects = Kernel Tools/MakeRamFS Applications/ASMApps +Projects = Kernel Tools/MakeRamFS Applications/SampleApps Kernel = Source/Kernel/Melon.ke RamFS = Init.rfs RamFSFiles = :/System :/System/Applications :/System/Configuration :/System/Keymaps \ Source/Kernel/Ressources/Keymaps/fr.mkm:/System/Keymaps/fr.mkm \ Source/Kernel/Ressources/Texts/Welcome.txt:/Welcome.txt \ - Source/Applications/ASMApps/test:/System/Applications/Test \ + Source/Applications/SampleApps/asmdemo:/ASMDemo.app \ :/Useless \ Source/Kernel/Ressources/Texts/Info.txt:/Useless/Info.txt \ Source/Kernel/Ressources/Graphics/logo.text.cxd:/Useless/Melon-logo -- cgit v1.2.3 From 323e12f1f9ab33df15dcfed210e807561d98fa8c Mon Sep 17 00:00:00 2001 From: Alexis211 Date: Sun, 18 Oct 2009 15:27:34 +0200 Subject: Re-organized everything --- Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 324deb7..9bb7f84 100644 --- a/Makefile +++ b/Makefile @@ -1,13 +1,14 @@ .PHONY: clean, mrproper, Init.rfs -Projects = Kernel Tools/MakeRamFS Applications/SampleApps +Projects = Kernel Library Tools/MakeRamFS Applications/SampleApps Kernel = Source/Kernel/Melon.ke RamFS = Init.rfs RamFSFiles = :/System :/System/Applications :/System/Configuration :/System/Keymaps \ Source/Kernel/Ressources/Keymaps/fr.mkm:/System/Keymaps/fr.mkm \ Source/Kernel/Ressources/Texts/Welcome.txt:/Welcome.txt \ - Source/Applications/SampleApps/asmdemo:/ASMDemo.app \ + Source/Applications/SampleApps/asmdemo:/ad \ + Source/Applications/SampleApps/cxxdemo:/cd \ :/Useless \ Source/Kernel/Ressources/Texts/Info.txt:/Useless/Info.txt \ Source/Kernel/Ressources/Graphics/logo.text.cxd:/Useless/Melon-logo @@ -32,9 +33,9 @@ clean: make -C Source/$$p clean -s; \ done -mproper: +mrproper: for p in $(Projects); do \ - make -C Source mrproper -s; \ + make -C Source/$$p mrproper -s; \ done $(RamFS): -- cgit v1.2.3 From 9836acd720988af30250c2c1ec18d618664dea4e Mon Sep 17 00:00:00 2001 From: Alexis211 Date: Tue, 20 Oct 2009 19:21:34 +0200 Subject: Started working on a userland shell This means I'll have to do syscalls for everything I need. --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 9bb7f84..1237ef8 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ .PHONY: clean, mrproper, Init.rfs -Projects = Kernel Library Tools/MakeRamFS Applications/SampleApps +Projects = Kernel Library Tools/MakeRamFS Applications/Shell Applications/SampleApps Kernel = Source/Kernel/Melon.ke RamFS = Init.rfs @@ -9,6 +9,7 @@ RamFSFiles = :/System :/System/Applications :/System/Configuration :/System/Keym Source/Kernel/Ressources/Texts/Welcome.txt:/Welcome.txt \ Source/Applications/SampleApps/asmdemo:/ad \ Source/Applications/SampleApps/cxxdemo:/cd \ + Source/Applications/Shell/Shell:/shell \ :/Useless \ Source/Kernel/Ressources/Texts/Info.txt:/Useless/Info.txt \ Source/Kernel/Ressources/Graphics/logo.text.cxd:/Useless/Melon-logo -- cgit v1.2.3