[SCM] applications.git branch, master, updated. 9b49fc5b867b96a3f6becfae87127b34f914a8f0

[ontologiae]

The following commit has been merged in the master branch:
commit 9b49fc5b867b96a3f6becfae87127b34f914a8f0
Merge: 6d1c69d10b2356380a5c255f021d0e6ee39bb566 9f5d0a991492763d9867b11592a8390709e3431a
Author: ontologiae <ontologiae at gmail.com>
Date:   Mon Nov 29 17:52:23 2010 +0100

    merge no_os

diff --combined isaacos/Makefile
index 3999066,a2e7edc..c82e9d0
--- a/isaacos/Makefile
+++ b/isaacos/Makefile
@@@ -2,8 -2,10 +2,10 @@@ TARGET = x8
  OBJ=kernel
  CC=gcc -Wall fno-stack-protector
  
- kernel : boot.o startup.o updateimage
- 	ld -Ttext=100000 --entry=_start  boot.o startup.o
+ kernel: boot.o startup.o link updateimage
+   
+ link: 
+ 	ld -Ttext=100000 --entry=_start  boot.o startup.o -o IsaacKernel
  
  boot.o: 
  	nasm -f elf -o boot.o boot.asm
@@@ -14,7 -16,8 +16,8 @@@
  
  
  startup.o:
- 	lisaacos startup.li -partial -nos_os -target $(TARGET)
 -	lisaac startup.li  -partial  -target $(TARGET)
++	lisaacos startup.li -partial -no_os -target $(TARGET)
+ 	gcc startup.c -o startup.o -c
  
  
  
@@@ -22,8 -25,8 +25,8 @@@ image
  	sh mkimage.sh
  
  updateimage:
- 	mount /dev/loop2 ./HdIsaac
- 	cp startup ./HdIsaac/IsaacKernel
+ 	mount /dev/loop3 ./HdIsaac
+ 	cp IsaacKernel ./HdIsaac/IsaacKernel
  
  
  startup.sys: startup.li 
@@@ -56,5 -59,4 +59,4 @@@ debug: startup.
  clean:
  	rm -rf *~
  	rm -f  *.o
- 	rm startup.sys
  	rm startup.c
diff --combined isaacos/startup.li
index 0138578,02ff26f..6182372
--- a/isaacos/startup.li
+++ b/isaacos/startup.li
@@@ -26,8 -26,7 +26,8 @@@ Section Heade
    
  // BUG: L'inclusion du parent dans fils (je genere un =, gcc genere un memcpy)
    - external := `
 -/* #include <signal.h>  
 +/* 
 +#include <signal.h>  
  __sighandler_t signal(int signum,__sighandler_t handler) { return(handler); }*/
  void *memcpy(void *dest,const void *src,int n) 
  { int j;
@@@ -59,8 -58,9 +59,9 @@@ Section Publi
    - main <-
    ( + dir:DIRECTORY;   
          
-     
+     "System initialization..".println;
      SYSTEM.make;
+     "Opening FileSystem...".println;
      
      
    //  SCHEDULER.make;

-- 
applications.git