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

diff --git a/OSX/Makefile b/OSX/Makefile
index 2353dc16..584ed755 100644
--- a/OSX/Makefile
+++ b/OSX/Makefile
@@ -1,13 +1,15 @@
-# XScreenSaver for MacOS X, Copyright (c) 2006 by Jamie Zawinski.
+# XScreenSaver for MacOS X, Copyright (c) 2006-2011 by Jamie Zawinski.
 
 XCODE_TARGET = "All Savers"
+XCODEBUILD=/Developer/usr/bin/xcodebuild
+XCODE_ARCH=-arch i386 -arch x86_64
 
 default: release
 all: debug release
 
 clean:
 	-rm -rf build
-#	cd ..; xcodebuild -target $(XCODE_TARGET) clean
+#	cd ..; $(XCODEBUILD) -target $(XCODE_TARGET) clean
 
 distclean:
 	-rm -f config.status config.cache config.log \
@@ -18,17 +20,17 @@ 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
 
 release:: sign
 
 sign:
-	@for f in build/Release/*.saver ; do \
+	@for f in build/Release/*.{saver,app} ; do \
 	  codesign -vfs 'Jamie Zawinski' $$f ; \
 	 done
 
@@ -38,7 +40,7 @@ check_versions:
   V=`sed -n 's/[^0-9]*\([0-9]\.[0-9][^. ]*\).*/\1/p' $$SRC` ;		\
   DIR=build/Release ;							\
   RESULT=0 ;								\
-  for S in $$DIR/*.saver ; do						\
+  for S in $$DIR/*.{saver,app} ; do					\
    for P in $$S/Contents/Info.plist ; do				\
      V2=`perl -0000 -n -e						\
 	'm@<key>CFBundleVersion</key>\s*<string>(.*?)</string>@si 	\
@@ -67,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 SaverTester.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							      \
@@ -107,9 +109,10 @@ dmg:: distdepend check_versions
       ../hacks/Makefile.in ;						      \
       perl -0 -ne							      \
      's/\\\\\\n//g; m/^RETIRED_GL_EXES\s*=\s*(.*)$$/m && print "$$1\n"'	      \
-      ../hacks/glx/Makefile.in` ;					      \
+      ../hacks/glx/Makefile.in ;					      \
+     echo xscreensaver` ;						      \
 									      \
-  for f in $$SRC/*.saver $$EXTRAS ; do					      \
+  for f in $$SRC/*.{saver,app} $$EXTRAS ; do				      \
    ok=yes ;								      \
    ff=`echo $$f | perl -e '$$_=<>; s@^.*/(.*)\..*$$@\L$$1@; print'`;	      \
    for r in $$retired ; do						      \