boot-122.tar.gz

[apple/boot.git] / i386 / boot2 / Makefile

diff --git a/i386/boot2/Makefile b/i386/boot2/Makefile
index 337443825995217433474c85bfb3c55f4d608516..4aa84deeec0a7723b35158ac3f265b3e22790cdd 100644 (file)
--- a/i386/boot2/Makefile
+++ b/i386/boot2/Makefile
@@ -6,8 +6,10 @@ DIR = boot2
 include ../MakePaths.dir
 
 OPTIM = -Os
 include ../MakePaths.dir
 
 OPTIM = -Os

-CFLAGS = $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wmost -Wno-precomp \
-    -munaligned-text -DSAIO_INTERNAL_USER -static -traditional-cpp
+CFLAGS = $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wmost -Werror \
+          -fno-builtin -DSAIO_INTERNAL_USER -static \
+         -fomit-frame-pointer -mpreferred-stack-boundary=2 \
+         -fno-align-functions

 DEFINES=
 CONFIG = hd
 SYMDIR = $(SYMROOT)
 DEFINES=
 CONFIG = hd
 SYMDIR = $(SYMROOT)


@@ -23,7 +25,8 @@ endif
 AS = as
 LD = ld
 # LIBS= -lc_static
 AS = as
 LD = ld
 # LIBS= -lc_static

-LIBS= -L$(SYMDIR) -lsaio -lsa -lrcz 
+LIBS= -L$(SYMDIR) -lsaio -lsa
+LIBDEP= $(SYMDIR)/libsaio.a $(SYMDIR)/libsa.a

 
 OTHER_FILES =
 
 
 OTHER_FILES =
 


@@ -32,25 +35,25 @@ VPATH = $(OBJROOT):$(SYMROOT)
 
 # The ordering is important;
 # boot2.o must be first.
 
 # The ordering is important;
 # boot2.o must be first.

-OBJS = boot2.o boot.o graphics.o drivers.o prompt.o
+OBJS = boot2.o boot.o graphics.o drivers.o prompt.o options.o lzss.o

 # button.o browser.o scrollbar.o == NOTYET     
 
 UTILDIR = ../util
 SFILES = boot2.s
 # button.o browser.o scrollbar.o == NOTYET     
 
 UTILDIR = ../util
 SFILES = boot2.s

-CFILES = boot.c graphics.c drivers.c prompt.c
-HFILES = boot.h
+CFILES = boot.c graphics.c drivers.c prompt.c options.c
+HFILES = boot.h appleClut8.h appleboot.h

 OTHERFILES = Makefile
 ALLSRC = $(FOREIGNSRC) $(FOREIGNBIN) $(SFILES) $(CFILES) \
        $(HFILES) $(OTHERFILES)
 DIRS_NEEDED = $(OBJROOT) $(SYMROOT)
 OTHERFILES = Makefile
 ALLSRC = $(FOREIGNSRC) $(FOREIGNBIN) $(SFILES) $(CFILES) \
        $(HFILES) $(OTHERFILES)
 DIRS_NEEDED = $(OBJROOT) $(SYMROOT)

-BOOT2ADDR = 3000
-MAXBOOTSIZE = 45056
+BOOT2ADDR = 20200
+MAXBOOTSIZE = 65024

 
 all: $(DIRS_NEEDED) boot
 
 
 all: $(DIRS_NEEDED) boot
 

-boot: machOconv $(OBJS)
+boot: machOconv $(OBJS) $(LIBDEP)

        $(LD) -static -preload -segaddr __TEXT $(BOOT2ADDR) -segalign 20 \
        $(LD) -static -preload -segaddr __TEXT $(BOOT2ADDR) -segalign 20 \

-               -o $(SYMROOT)/boot.sys $(OBJS) $(LIBS) -lcc_kext
+               -o $(SYMROOT)/boot.sys $(filter %.o,$^) $(LIBS) -lcc_kext

        machOconv $(SYMROOT)/boot.sys $(SYMROOT)/boot
        size $(SYMROOT)/boot.sys
        ls -l $(SYMROOT)/boot
        machOconv $(SYMROOT)/boot.sys $(SYMROOT)/boot
        size $(SYMROOT)/boot.sys
        ls -l $(SYMROOT)/boot


@@ -72,7 +75,7 @@ install_i386:: all $(INSTALLDIR)
        cd $(INSTALLDIR); chmod u+w boot $(OTHER_FILES)
 
 clean::
        cd $(INSTALLDIR); chmod u+w boot $(OTHER_FILES)
 
 clean::

-       rm -f $(SYMROOT)/boot.sys $(SYMROOT)/boot
+       rm -f $(SYMROOT)/boot.sys $(SYMROOT)/boot $(SYMROOT)/vers.h

 
 include ../MakeInc.dir
 
 
 include ../MakeInc.dir