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

diff --git a/OSX/Makefile b/OSX/Makefile
index 3f7886b6..63a5aba5 100644
--- a/OSX/Makefile
+++ b/OSX/Makefile
@@ -1,14 +1,17 @@
 # XScreenSaver for MacOS X, Copyright (c) 2006-2011 by Jamie Zawinski.
 
-XCODE_TARGET = "All Savers"
-XCODEBUILD=/Developer/usr/bin/xcodebuild
+XCODEBUILD = /Developer/usr/bin/xcodebuild
+TARGETS    = -target "All Savers"
+ARCH       = -arch i386 -arch x86_64
+CERT       = 'Jamie Zawinski'
+CERT       = 'iPhone Developer: Jamie Zawinski (Y5M82TL69N)'
 
 default: release
 all: debug release
 
 clean:
 	-rm -rf build
-#	cd ..; $(XCODEBUILD) -target $(XCODE_TARGET) clean
+#	cd ..; $(XCODEBUILD) -target $(TARGETS) clean
 
 distclean:
 	-rm -f config.status config.cache config.log \
@@ -19,10 +22,10 @@ distclean:
 distdepend:: update_plist_version
 
 debug: distdepend
-	cd ..; $(XCODEBUILD) -target $(XCODE_TARGET) -configuration Debug   build
+	cd ..; $(XCODEBUILD) $(ARCH) $(TARGETS) -configuration Debug   build
 
 release:: distdepend
-	cd ..; $(XCODEBUILD) -target $(XCODE_TARGET) -configuration Release build
+	cd ..; $(XCODEBUILD) $(ARCH) $(TARGETS) -configuration Release build
 
 release:: check_versions
 
@@ -30,7 +33,7 @@ release:: sign
 
 sign:
 	@for f in build/Release/*.{saver,app} ; do \
-	  codesign -vfs 'Jamie Zawinski' $$f ; \
+	  codesign -vfs $(CERT) $$f ; \
 	 done
 
 check_versions:
@@ -68,7 +71,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 +112,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 ;								      \