X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=OSX%2Fmain.m;h=0dfb038bd659d9e7d5cfdd49681c7020416547c3;hp=570c96135e5dc30276d6a8205996e52c04e05eaf;hb=019de959b265701cd0c3fccbb61f2b69f06bf9ee;hpb=49f5b54f312fe4ac2e9bc47581a72451bd0e8439

diff --git a/OSX/main.m b/OSX/main.m
index 570c9613..0dfb038b 100644
--- a/OSX/main.m
+++ b/OSX/main.m
@@ -1,17 +1,29 @@
-/* xscreensaver, Copyright (c) 2006 Jamie Zawinski <jwz@jwz.org>
-*
-* Permission to use, copy, modify, distribute, and sell this software and its
-* documentation for any purpose is hereby granted without fee, provided that
-* the above copyright notice appear in all copies and that both that
-* copyright notice and this permission notice appear in supporting
-* documentation.  No representations are made about the suitability of this
-* software for any purpose.  It is provided "as is" without express or 
-* implied warranty.
-*/
+/* xscreensaver, Copyright (c) 2006-2012 Jamie Zawinski <jwz@jwz.org>
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation.  No representations are made about the suitability of this
+ * software for any purpose.  It is provided "as is" without express or 
+ * implied warranty.
+ */
 
-#import <Cocoa/Cocoa.h>
+#ifdef USE_IPHONE
+# import <UIKit/UIKit.h>
+#else
+# import <Cocoa/Cocoa.h>
+#endif
 
-int main(int argc, char *argv[])
+int
+main (int argc, char *argv[])
 {
-    return NSApplicationMain(argc,  (const char **) argv);
+# ifdef USE_IPHONE
+  NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+  int ret = UIApplicationMain (argc, argv, nil, nil);
+  [pool release];
+  return ret;
+# else
+  return NSApplicationMain(argc, (const char **) argv);
+# endif
 }