Index: branches/cparm/Chameleon.xcodeproj/project.pbxproj =================================================================== --- branches/cparm/Chameleon.xcodeproj/project.pbxproj (revision 2045) +++ branches/cparm/Chameleon.xcodeproj/project.pbxproj (revision 2046) @@ -9,6 +9,7 @@ /* Begin PBXFileReference section */ AB0E930C14C6223500F798D7 /* cpu_intel_amd.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cpu_intel_amd.c; sourceTree = ""; }; AB22095D15334C9E00AA9851 /* md5.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = md5.h; sourceTree = ""; }; + AB3117CF15DBCBDE00DA0817 /* fake_crt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = fake_crt.c; sourceTree = ""; }; AB42D02115187F2C0078E84A /* background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = background.png; sourceTree = ""; }; AB42D02215187F2C0078E84A /* boot.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = boot.png; sourceTree = ""; }; AB42D02315187F2C0078E84A /* device_cdrom.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = device_cdrom.png; sourceTree = ""; }; @@ -917,6 +918,7 @@ AB43B2D414C37E520018D529 /* options.c */, AB43B2D514C37E520018D529 /* options.h */, AB43B2D614C37E520018D529 /* prompt.c */, + AB3117CF15DBCBDE00DA0817 /* fake_crt.c */, ); path = boot2; sourceTree = ""; Index: branches/cparm/CHANGES =================================================================== --- branches/cparm/CHANGES (revision 2045) +++ branches/cparm/CHANGES (revision 2046) @@ -1,4 +1,7 @@ -- Security fixes +- Added fake_crt.c to fix a linker issue ... but it still dont work. +- Added minor changes to makeinc.dir + +- Security fixes - Added beta support for Xcode 4.4 - Added memory info to the nvidia plist structure, so now one can add several cards to the plist and set a customized name and memory info for each cards Index: branches/cparm/i386/MakeInc.dir =================================================================== --- branches/cparm/i386/MakeInc.dir (revision 2045) +++ branches/cparm/i386/MakeInc.dir (revision 2046) @@ -19,6 +19,7 @@ # clearly handles it appropriately so I have no idea why Apple omitted it. #OMIT_FRAME_POINTER_CFLAG=-fomit-frame-pointer OMIT_FRAME_POINTER_CFLAG= +HAVE_MD = YES installsrc:: $(SRCROOT) cp $(ALLSRC) $(SRCROOT) @@ -39,6 +40,8 @@ .SUFFIXES: .s .i .c .o +ifeq ($(HAVE_MD),YES) + .c.o .m.o: $(CC) $(CPPFLAGS) $(GFLAGS) $(CFLAGS) $(DEFINES) -c $(INC) $< -o $(OBJROOT)/$*.o -MD -dependency-file $(OBJROOT)/$*.d $(SYMROOT)/md -u $(OBJROOT)/Makedep -f -d $(OBJROOT)/$*.d @@ -51,6 +54,20 @@ $(CC) $(CPPFLAGS) $(GFLAGS) $(CFLAGS) $(DEFINES) -c $(INC) $< -o $(OBJROOT)/$*.o -MD -dependency-file $(OBJROOT)/$*.d $(SYMROOT)/md -u $(OBJROOT)/Makedep -f -d $(OBJROOT)/$*.d +else + +.c.o .m.o: + $(CC) $(CPPFLAGS) $(GFLAGS) $(CFLAGS) $(DEFINES) -c $(INC) $< -o $(OBJROOT)/$*.o + +$(OBJROOT)/%.o: %.c + $(CC) $(CPPFLAGS) $(GFLAGS) $(CFLAGS) $(DEFINES) -c $(INC) $< -o $(OBJROOT)/$*.o + +$(OBJROOT)/%.o: %.m + $(CC) $(CPPFLAGS) $(GFLAGS) $(CFLAGS) $(DEFINES) -c $(INC) $< -o $(OBJROOT)/$*.o + +endif + + # Use GCC or LLVM-GCC for assembly files .s.o: gcc $(CPPFLAGS) $(GFLAGS) -c $(INC) -arch i386 -o $(OBJROOT)/$(@F) $< Index: branches/cparm/i386/boot2/fake_crt.c =================================================================== --- branches/cparm/i386/boot2/fake_crt.c (revision 0) +++ branches/cparm/i386/boot2/fake_crt.c (revision 2046) @@ -0,0 +1,12 @@ +/* + * Copyright (c) 2012 cparm . All rights reserved. + * + */ + +#include "libsa.h" + +void start(void) asm("start"); + +void start(void) +{ +} \ No newline at end of file Index: branches/cparm/i386/boot2/Makefile =================================================================== --- branches/cparm/i386/boot2/Makefile (revision 2045) +++ branches/cparm/i386/boot2/Makefile (revision 2046) @@ -86,7 +86,7 @@ @echo "\t[LD] boot.sys" @$(BINROOT)/ld_classic -static -segalign 20 -segaddr __INIT $(BOOT2ADDR) -preload \ -arch i386 \ - -o $(SYMROOT)/boot.sys $(filter %.o,$^) $(LIBS) #-e boot2 + -o $(SYMROOT)/boot.sys $(filter %.o,$^) $(LIBS) #-e start @echo "\t[MACHOCONV] boot" @$(SYMROOT)/machOconv $(SYMROOT)/boot.sys $(SYMROOT)/boot #&> /dev/null