Index: trunk/i386/MakeInc.dir
===================================================================
--- trunk/i386/MakeInc.dir	(revision 698)
+++ trunk/i386/MakeInc.dir	(revision 699)
@@ -37,8 +37,18 @@
 
 installhdrs::
 
-.SUFFIXES: .s .i .c .o
+.SUFFIXES: .s .i .c .o .o32 .o64
 
+.c.o32:
+	$(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:
+	$(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:
 	$(CC) $(CPPFLAGS) $(CFLAGS) $(DEFINES) -c $(INC) $< -o $(OBJROOT)/$*.o \
 	    -MD -dependency-file $(OBJROOT)/$*.d
@@ -49,6 +59,17 @@
 	    -MD -dependency-file $(OBJROOT)/$*.d
 	md -u $(OBJROOT)/Makedep -f -d $(OBJROOT)/$*.d
 
+$(OBJROOT)/%.o32: %.c
+	$(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
+	$(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
 	$(CC) $(CPPFLAGS) $(CFLAGS) $(DEFINES) -c $(INC) $< -o $(OBJROOT)/$*.o \
 	    -MD -dependency-file $(OBJROOT)/$*.d
Index: trunk/i386/util/Makefile
===================================================================
--- trunk/i386/util/Makefile	(revision 698)
+++ trunk/i386/util/Makefile	(revision 699)
@@ -26,12 +26,22 @@
 
 all embedtheme: $(DIRS_NEEDED) $(PROGRAMS)
 
-machOconv: machOconv.o
-	$(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -o $(SYMROOT)/$(@F) machOconv.o
+machOconv: machOconv.o32 machOconv.o64
+	$(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -arch i386 -o $(SYMROOT)/$(@F)_32 $(OBJROOT)/$(@F).o32
+	$(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -arch x86_64 -o $(SYMROOT)/$(@F)_64 $(OBJROOT)/$(@F).o64
+	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
-	$(CC) $(CFLAGS) $(LDFLAGS) -framework IOKit -framework CoreFoundation -mmacosx-version-min=10.5 -o $(SYMROOT)/$(@F) bdmesg.o
 
+bdmesg: bdmesg.o32 bdmesg.o64
+	$(CC) $(CFLAGS) $(LDFLAGS) -framework IOKit -framework CoreFoundation -mmacosx-version-min=10.5 \
+		 -arch i386 -o $(SYMROOT)/$(@F)_32 $(OBJROOT)/$(@F).o32
+	$(CC) $(CFLAGS) $(LDFLAGS) -framework IOKit -framework CoreFoundation -mmacosx-version-min=10.5 \
+		 -arch x86_64 -o $(SYMROOT)/$(@F)_64 $(OBJROOT)/$(@F).o64
+	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