X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=OSX%2FMakefile;h=584ed7557def111273fe6c00c685c5705f0f7741;hp=3f7886b6cb241336a335e2bbbc2dbcc879e6e264;hb=f8cf5ac7b2f53510f80a0eaf286a25298be17bfe;hpb=ec8d2b32b63649e6d32bdfb306eda062769af823

diff --git a/OSX/Makefile b/OSX/Makefile
index 3f7886b6..584ed755 100644
--- a/OSX/Makefile
+++ b/OSX/Makefile
@@ -2,6 +2,7 @@
 
 XCODE_TARGET = "All Savers"
 XCODEBUILD=/Developer/usr/bin/xcodebuild
+XCODE_ARCH=-arch i386 -arch x86_64
 
 default: release
 all: debug release
@@ -19,10 +20,10 @@ distclean:
 distdepend:: update_plist_version
 
 debug: distdepend
-	cd ..; $(XCODEBUILD) -target $(XCODE_TARGET) -configuration Debug   build
+	cd ..; $(XCODEBUILD) $(XCODE_ARCH) -target $(XCODE_TARGET) -configuration Debug   build
 
 release:: distdepend
-	cd ..; $(XCODEBUILD) -target $(XCODE_TARGET) -configuration Release build
+	cd ..; $(XCODEBUILD) $(XCODE_ARCH) -target $(XCODE_TARGET) -configuration Release build
 
 release:: check_versions
 
@@ -68,7 +69,7 @@ update_plist_version:
   SRC=../utils/version.h ;						      \
   V=`sed -n 's/[^0-9]*\([0-9]\.[0-9][^. ]*\).*/\1/p' $$SRC` ;		      \
   T=/tmp/xs.$$$$ ;							      \
-  for S in XScreenSaver.plist SaverRunner.plist ; do			      \
+  for S in XScreenSaver.plist SaverRunner.plist iSaverRunner.plist ; do	      \
     /bin/echo -n "Updating version number in $$S to \"$$V\"... " ;	      \
     KEYS="CFBundleVersion|CFBundleShortVersionString" ;			      \
     perl -0777 -pne							      \
@@ -109,7 +110,7 @@ dmg:: distdepend check_versions
       perl -0 -ne							      \
      's/\\\\\\n//g; m/^RETIRED_GL_EXES\s*=\s*(.*)$$/m && print "$$1\n"'	      \
       ../hacks/glx/Makefile.in ;					      \
-     echo savertester` ;						      \
+     echo xscreensaver` ;						      \
 									      \
   for f in $$SRC/*.{saver,app} $$EXTRAS ; do				      \
    ok=yes ;								      \