Index: branches/meklort/i386/MakeInc.dir =================================================================== --- branches/meklort/i386/MakeInc.dir (revision 728) +++ branches/meklort/i386/MakeInc.dir (revision 729) @@ -40,8 +40,20 @@ installhdrs:: -.SUFFIXES: .s .i .c .o +.SUFFIXES: .s .i .c .o .o32 .o64 +.c.o32: + @echo "\t[CC32] $<" + @$(CC) $(CPPFLAGS) $(CFLAGS) $(DEFINES) -c $(INC) -arch i386 $< -o $(OBJROOT)/$*.o32 \ + -MD -dependency-file $(OBJROOT)/$*.d + @md -u $(OBJROOT)/Makedep -f -d $(OBJROOT)/$*.d + +.c.o64: + @echo "\t[CC64] $<" + @$(CC) $(CPPFLAGS) $(CFLAGS) $(DEFINES) -c $(INC) -arch x86_64 $< -o $(OBJROOT)/$*.o64 \ + -MD -dependency-file $(OBJROOT)/$*.d + @md -u $(OBJROOT)/Makedep -f -d $(OBJROOT)/$*.d + .c.o .m.o: @echo "\t[CC] $<" @$(CC) $(CPPFLAGS) $(CFLAGS) $(DEFINES) -c $(INC) $< -o $(OBJROOT)/$*.o \ @@ -54,6 +66,18 @@ -MD -dependency-file $(OBJROOT)/$*.d @md -u $(OBJROOT)/Makedep -f -d $(OBJROOT)/$*.d +$(OBJROOT)/%.o32: %.c + @echo "\t[CC32] $<" + @$(CC) $(CPPFLAGS) $(CFLAGS) $(DEFINES) -c $(INC) -arch i386 $< -o $(OBJROOT)/$*.o32 \ + -MD -dependency-file $(OBJROOT)/$*.d + @md -u $(OBJROOT)/Makedep -f -d $(OBJROOT)/$*.d + +$(OBJROOT)/%.o64: %.c + @echo "\t[CC64] $<" + @$(CC) $(CPPFLAGS) $(CFLAGS) $(DEFINES) -c $(INC) -arch x86_64 $< -o $(OBJROOT)/$*.o64 \ + -MD -dependency-file $(OBJROOT)/$*.d + @md -u $(OBJROOT)/Makedep -f -d $(OBJROOT)/$*.d + $(OBJROOT)/%.o: %.m @echo "\t[CC] $<" @$(CC) $(CPPFLAGS) $(CFLAGS) $(DEFINES) -c $(INC) $< -o $(OBJROOT)/$*.o \ Index: branches/meklort/i386/util/Makefile =================================================================== --- branches/meklort/i386/util/Makefile (revision 728) +++ branches/meklort/i386/util/Makefile (revision 729) @@ -24,23 +24,41 @@ DIRS_NEEDED = $(OBJROOT) $(SYMROOT) $(LANGDIR) -all embedtheme optionrom: $(DIRS_NEEDED) $(PROGRAMS) +all embedtheme: $(DIRS_NEEDED) $(PROGRAMS) -dyldsymboltool: dyldsymboltool.o - @echo "\t[LD] $@" - @$(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -o $(SYMROOT)/$(@F) dyldsymboltool.o +dyldsymboltool: dyldsymboltool.o32 dyldsymboltool.o64 + @echo "\t[LD32] $@" + @$(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -arch i386 -o $(SYMROOT)/$(@F)_32 $(OBJROOT)/$(@F).o32 + @echo "\t[LD64] $@" + @$(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -arch x86_64 -o $(SYMROOT)/$(@F)_64 $(OBJROOT)/$(@F).o64 + @echo "\t[LIPO] $@" + @lipo -create -arch i386 $(SYMROOT)/$(@F)_32 -arch x86_64 $(SYMROOT)/$(@F)_64 -output $(SYMROOT)/$(@F) + @$(RM) $(SYMROOT)/$(@F)_32 $(SYMROOT)/$(@F)_64 -machOconv: machOconv.o - @echo "\t[LD] $@" - @$(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -o $(SYMROOT)/$(@F) machOconv.o +machOconv: machOconv.o32 machOconv.o64 + @echo "\t[LD32] $@" + @$(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -arch i386 -o $(SYMROOT)/$(@F)_32 $(OBJROOT)/$(@F).o32 + @echo "\t[LD64] $@" + @$(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -arch x86_64 -o $(SYMROOT)/$(@F)_64 $(OBJROOT)/$(@F).o64 + @echo "\t[LIPO] $@" + @lipo -create -arch i386 $(SYMROOT)/$(@F)_32 -arch x86_64 $(SYMROOT)/$(@F)_64 -output $(SYMROOT)/$(@F) + @$(RM) $(SYMROOT)/$(@F)_32 $(SYMROOT)/$(@F)_64 -bdmesg: bdmesg.o - @echo "\t[LD] $@" - @$(CC) $(CFLAGS) $(LDFLAGS) -framework IOKit -framework CoreFoundation -mmacosx-version-min=10.5 -o $(SYMROOT)/$(@F) bdmesg.o +bdmesg: bdmesg.o32 bdmesg.o64 + @echo "\t[LD32] $@" + @$(CC) $(CFLAGS) $(LDFLAGS) -framework IOKit -framework CoreFoundation -mmacosx-version-min=10.5 \ + -arch i386 -o $(SYMROOT)/$(@F)_32 $(OBJROOT)/$(@F).o32 + @echo "\t[LD64] $@" + @$(CC) $(CFLAGS) $(LDFLAGS) -framework IOKit -framework CoreFoundation -mmacosx-version-min=10.5 \ + -arch x86_64 -o $(SYMROOT)/$(@F)_64 $(OBJROOT)/$(@F).o64 + @echo "\t[LIPO] $@" + @lipo -create -arch i386 $(SYMROOT)/$(@F)_32 -arch x86_64 $(SYMROOT)/$(@F)_64 -output $(SYMROOT)/$(@F) + @$(RM) $(SYMROOT)/$(@F)_32 $(SYMROOT)/$(@F)_64 + + include ../MakeInc.dir #dependencies --include $(OBJROOT)/Makedep - +-include $(OBJROOT)/Makedep \ No newline at end of file