Index: branches/xZenu/Make.rules =================================================================== --- branches/xZenu/Make.rules (revision 1284) +++ branches/xZenu/Make.rules (revision 1285) @@ -26,7 +26,9 @@ -MD -dependency-file $(OBJROOT)/$*.d @md -u $(OBJROOT)/Makedep -f -d $(OBJROOT)/$*.d +NATIVE_OBJECTS = $(addsuffix .o, $(addprefix $(OBJROOT)/, $(OBJECTS))) + $(DIRS_NEEDED) $(INSTALLDIR) $(OBJROOT) $(SYMROOT): @echo "\t[MKDIR] $@" @$(MKDIRS) $@ Index: branches/xZenu/src/arch/i386/boot2/Makefile =================================================================== --- branches/xZenu/src/arch/i386/boot2/Makefile (revision 1284) +++ branches/xZenu/src/arch/i386/boot2/Makefile (revision 1285) @@ -20,7 +20,7 @@ #todo: ensur ecorrect arch -MACHOCONV = ${SYMROOT}/../util/machOconv.${ARCH} +MACHOCONV = ${SYMROOT}/../util/machOconv LIBSADIR = ../libsa LIBSAIODIR = ../libsaio @@ -75,7 +75,7 @@ @# Generate the Symbols.dylib file @echo "\t[dyldsymboltool] Symbols.dylib" - @$(SYMROOT)/../util/dyldsymboltool.${ARCH} $(SYMROOT)/boot.sys $(SYMROOT)/${SYMBOLS_MODULE} + @$(SYMROOT)/../util/dyldsymboltool $(SYMROOT)/boot.sys $(SYMROOT)/${SYMBOLS_MODULE} @echo "\t[LD] boot.sys" @$(CC) -static -Wl,-preload -Wl,-segaddr,__INIT,$(BOOT2ADDR) \ @@ -88,7 +88,7 @@ @# Generate the Symbols.dylib file @echo "\t[dyldsymboltool] Symbols.dylib" - @$(SYMROOT)/../util/dyldsymboltool.${ARCH} $(SYMROOT)/boot.sys $(SYMROOT)/${SYMBOLS_MODULE} + @$(SYMROOT)/../util/dyldsymboltool $(SYMROOT)/boot.sys $(SYMROOT)/${SYMBOLS_MODULE} @${RM} $(SYMROOT)/boot.sys @echo "\t[LD] boot.sys" Index: branches/xZenu/src/util/fdisk/Makefile =================================================================== --- branches/xZenu/src/util/fdisk/Makefile (revision 1284) +++ branches/xZenu/src/util/fdisk/Makefile (revision 1285) @@ -19,14 +19,10 @@ all: $(SYMROOT) $(OBJROOT) $(PROGRAM) -$(PROGRAM): $(ACTUAL_OBJECTS) +$(PROGRAM): $(NATIVE_OBJECTS) @echo "\t[LD:${ARCH}] $(@F)" - @$(TARGET_CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -arch ${ARCH} -o $(SYMROOT)/$(@F).${ARCH} $(ACTUAL_OBJECTS) + @$(TARGET_CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -o $(SYMROOT)/$(@F) $(NATIVE_OBJECTS) - @#echo "\t[LIPO] $(@F)" - @#lipo -create -arch i386 $(SYMROOT)/$(@F).i386 -arch ppc $(SYMROOT)/$(@F).ppc -output $(SYMROOT)/$(@F) - @#$(RM) $(SYMROOT)/$(@F).i386 $(SYMROOT)/$(@F).x86_64 $(SYMROOT)/$(@F).ppc - else all: endif Index: branches/xZenu/src/util/dyldsymboltool.c =================================================================== --- branches/xZenu/src/util/dyldsymboltool.c (revision 1284) +++ branches/xZenu/src/util/dyldsymboltool.c (revision 1285) @@ -154,7 +154,7 @@ , 1, outfile); char* symtab = malloc(dylib.symtab.stroff + dylib.symtab.strsize - sizeof(dylib) + 1); // Add extra 1 for last symbol - bzero(symtab, dylib.symtab.nsyms * sizeof(struct nlist) + dylib.symtab.strsize + 1); + memset(symtab, 0, dylib.symtab.nsyms * sizeof(struct nlist) + dylib.symtab.strsize + 1); char* orig = symtab; //symtab += offset; Index: branches/xZenu/src/util/Makefile =================================================================== --- branches/xZenu/src/util/Makefile (revision 1284) +++ branches/xZenu/src/util/Makefile (revision 1285) @@ -27,7 +27,7 @@ endif -LDFLAGS := $(LDFALGS) -framework IOKit -framework CoreFoundation -mmacosx-version-min=10.4 +LDFLAGS = $(TARGET_LDFLAGS) -framework IOKit -framework CoreFoundation -mmacosx-version-min=10.4 SYMPROG = $(addsuffix $(addprefix $(SYMROOT)/, $(PROGRAMS)), .${ARCH}) @@ -40,14 +40,10 @@ -$(SYMPROG): ${ACTUAL_OBJECTS} +$(SYMPROG): ${NATIVE_OBJECTS} @echo "\t[LD:${ARCH}] $(@F)" - @$(TARGET_CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -arch ${ARCH} -o $(SYMROOT)/$(@F).${ARCH} $(OBJROOT)/$(@F).${ARCH}o + @$(TARGET_CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -o $(SYMROOT)/$(@F) $(OBJROOT)/$(@F).o - @#echo "\t[LIPO] $(@F)" - @#lipo -create -arch i386 $(SYMROOT)/$(@F).i386 -arch ppc $(SYMROOT)/$(@F).ppc -output $(SYMROOT)/$(@F) - @#$(RM) $(SYMROOT)/$(@F).i386 $(SYMROOT)/$(@F).ppc - .PHONY: fdisk440 fdisk440: @echo ================= make all for fdisk =================;