[SCM] applications.git branch, master, updated. b6e6c9fe2c5adcb2a7f55f62c8a911d1d2d7c7db

[ontologiae]

The following commit has been merged in the master branch:
commit e2aa5e177702a97cfcaf5c9a9cb39a87f91914a0
Author: ontologiae <ontologiae at gmail.com>
Date:   Fri Nov 26 11:33:30 2010 +0100

    add ld in makefile

diff --git a/isaacos/Makefile b/isaacos/Makefile
index e660d3f..567ca1a 100644
--- a/isaacos/Makefile
+++ b/isaacos/Makefile
@@ -3,6 +3,7 @@ OBJ=kernel
 CC=gcc -Wall fno-stack-protector
 
 kernel : boot.o startup.o updateimage
+	ld -Ttext=100000 --entry=_start  boot.o startup.o
 
 boot.o: 
 	nasm -f elf -o boot.o boot.asm
@@ -53,9 +54,6 @@ debug: startup.c
 	tool/script/dosemu c startup.sys .
 	tool/script/dosemu e
 clean:
-
-	
-# 	rm startup
 	rm -rf *~
 	rm -f  *.o
 	rm startup.sys

-- 
applications.git