Use SDL on OSX

7 files changed, 512 insertions, 115 deletions

diff --git a/default.bam b/default.bam
index debea93f..346a6102 100644
--- a/default.bam
+++ b/default.bam
@@ -352,6 +352,12 @@ function build(settings)
 				client_settings.linker.frameworks:add("AudioToolbox")
 				client_settings.linker.frameworks:add("AudioUnit")
 			end
+
+			if use_sdl then
+				client_settings.linker.frameworks:add("SDL")
+				client_settings.cc.includes:add("SDL.framework/Headers")
+				client_settings.linker.frameworkpath:add(".")
+			end
 		else
 			if config.alsa.value == 1 then
             	client_settings.linker.libs:add("asound")
@@ -393,7 +399,10 @@ function build(settings)
 	-- build tools (TODO: fix this so we don't get double _d_d stuff)
 	tools_src = Collect("src/tools/*.cpp", "src/tools/*.c")
 
-	osxlaunch_src = Collect("src/osxlaunch/*.m")
+	osxlaunch = {}
+	if platform == "macosx" and use_sdl then
+		osxlaunch = Compile(client_settings, Collect("src/osxlaunch/*.m"))
+	end
 	
 	objs = Compile(settings, tools_src)
 	tools = {}
@@ -405,7 +414,7 @@ function build(settings)
 	-- build client, server, version server and master server
 	client_exe = Link(client_settings, "teeworlds", game_shared, game_client,
 		engine, client, game_editor, glfw, portaudio, zlib, pnglite, wavpack,
-		client_link_other)
+		client_link_other, osxlaunch)
 
 	server_exe = Link(server_settings, "teeworlds_srv", engine, server,
 		game_shared, game_server, zlib)
@@ -416,10 +425,6 @@ function build(settings)
 	masterserver_exe = Link(server_settings, "mastersrv", masterserver,
 		engine, zlib)
 
-	if platform == "macosx" then
-		osxlaunch_exe = Link(client_settings, "osxlaunch", osxlaunch_src)
-	end
-
 	-- make targets
 	c = PseudoTarget("client".."_"..settings.config_name, client_exe)
 	s = PseudoTarget("server".."_"..settings.config_name, server_exe)
@@ -433,12 +438,7 @@ function build(settings)
 	Target(m)
 	Target(t)
 	
-	if platform == "macosx" then
-		o = PseudoTarget("osxlaunch".."_"..settings.config_name, osxlaunch_exe)
-		all = PseudoTarget(settings.config_name, c, s, v, m, t, o)
-	else
-		all = PseudoTarget(settings.config_name, c, s, v, m, t)
-	end
+	all = PseudoTarget(settings.config_name, c, s, v, m, t)
 
 	Target(all)
 	return all
diff --git a/scripts/make_release.py b/scripts/make_release.py
index e2314884..99e6d357 100644
--- a/scripts/make_release.py
+++ b/scripts/make_release.py
@@ -81,16 +81,18 @@ if use_bundle:
 	bundle_content_dir = os.path.join(package_dir, "Teeworlds.app/Contents")
 	bundle_bin_dir = os.path.join(bundle_content_dir, "MacOS")
 	bundle_resource_dir = os.path.join(bundle_content_dir, "Resources")
+	bundle_framework_dir = os.path.join(bundle_content_dir, "Frameworks")
 	os.mkdir(os.path.join(package_dir, "Teeworlds.app"))
 	os.mkdir(bundle_content_dir)
 	os.mkdir(bundle_bin_dir)
 	os.mkdir(bundle_resource_dir)
+	os.mkdir(bundle_framework_dir)
 	os.mkdir(os.path.join(bundle_resource_dir, "data"))
 	copydir("data", bundle_resource_dir)
 	shutil.copy("other/icons/Teeworlds.icns", bundle_resource_dir)
 	shutil.copy(name+exe_ext, bundle_bin_dir)
 	shutil.copy(name+"_srv"+exe_ext, bundle_bin_dir)
-	shutil.copy("osxlaunch"+exe_ext, bundle_bin_dir)
+	#copydir("SDL.framework", bundle_framework_dir)
 	file(os.path.join(bundle_content_dir, "Info.plist"), "w").write("""
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
@@ -99,7 +101,7 @@ if use_bundle:
         <key>CFBundleDevelopmentRegion</key>
         <string>English</string>
         <key>CFBundleExecutable</key>
-        <string>osxlaunch</string>
+        <string>teeworlds</string>
         <key>CFBundleIconFile</key>
         <string>Teeworlds</string>
         <key>CFBundleInfoDictionaryVersion</key>
diff --git a/src/engine/client/ec_client.c b/src/engine/client/ec_client.c
index 96700cb0..8ef6cf51 100644
--- a/src/engine/client/ec_client.c
+++ b/src/engine/client/ec_client.c
@@ -1841,7 +1841,11 @@ const char *client_user_directory()
 	return path;
 }
 
+#if defined(CONF_PLATFORM_MACOSX)
+int SDL_main(int argc, char **argv)
+#else
 int main(int argc, char **argv)
+#endif
 {
 	/* init the engine */
 	dbg_msg("client", "starting...");
diff --git a/src/engine/client/ec_gfx.c b/src/engine/client/ec_gfx.c
index c4e892cc..bb5c7e91 100644
--- a/src/engine/client/ec_gfx.c
+++ b/src/engine/client/ec_gfx.c
@@ -1,13 +1,22 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
 
+#include <base/detect.h>
+
 #ifdef CONFIG_NO_SDL
 	#include <GL/glfw.h>
 #else
 	#include "SDL.h"
+
+#ifdef CONF_PLATFORM_MACOSX
+	#include <OpenGL/gl.h>
+	#include <OpenGL/glu.h>
+#else
 	#include <GL/gl.h>
 	#include <GL/glu.h>
 #endif
 
+#endif
+
 #include <engine/external/pnglite/pnglite.h>
 
 #include <base/system.h>
diff --git a/src/osxlaunch/SDLMain.h b/src/osxlaunch/SDLMain.h
new file mode 100644
index 00000000..4683df57
--- /dev/null
+++ b/src/osxlaunch/SDLMain.h
@@ -0,0 +1,11 @@
+/*   SDLMain.m - main entry point for our Cocoa-ized SDL app
+       Initial Version: Darrell Walisser <dwaliss1@purdue.edu>
+       Non-NIB-Code & other changes: Max Horn <max@quendi.de>
+
+    Feel free to customize this file to suit your needs
+*/
+
+#import <Cocoa/Cocoa.h>
+
+@interface SDLMain : NSObject
+@end
diff --git a/src/osxlaunch/SDLMain.m b/src/osxlaunch/SDLMain.m
new file mode 100644
index 00000000..a1e0d156
--- /dev/null
+++ b/src/osxlaunch/SDLMain.m
@@ -0,0 +1,472 @@
+/*   SDLMain.m - main entry point for our Cocoa-ized SDL app
+       Initial Version: Darrell Walisser <dwaliss1@purdue.edu>
+       Non-NIB-Code & other changes: Max Horn <max@quendi.de>
+
+    Feel free to customize this file to suit your needs
+*/
+
+#import <SDL.h>
+#import "SDLMain.h"
+#import <sys/param.h> /* for MAXPATHLEN */
+#import <unistd.h>
+#include <Carbon/Carbon.h>
+
+/* For some reaon, Apple removed setAppleMenu from the headers in 10.4,
+ but the method still is there and works. To avoid warnings, we declare
+ it ourselves here. */
+@interface NSApplication(SDL_Missing_Methods)
+- (void)setAppleMenu:(NSMenu *)menu;
+@end
+
+/* Use this flag to determine whether we use SDLMain.nib or not */
+#define		SDL_USE_NIB_FILE	0
+
+/* Use this flag to determine whether we use CPS (docking) or not */
+#define		SDL_USE_CPS		1
+#ifdef SDL_USE_CPS
+/* Portions of CPS.h */
+typedef struct CPSProcessSerNum
+{
+	UInt32		lo;
+	UInt32		hi;
+} CPSProcessSerNum;
+
+extern OSErr	CPSGetCurrentProcess( CPSProcessSerNum *psn);
+extern OSErr 	CPSEnableForegroundOperation( CPSProcessSerNum *psn, UInt32 _arg2, UInt32 _arg3, UInt32 _arg4, UInt32 _arg5);
+extern OSErr	CPSSetFrontProcess( CPSProcessSerNum *psn);
+
+#endif /* SDL_USE_CPS */
+
+static int    gArgc;
+static char  **gArgv;
+static BOOL   gFinderLaunch;
+static BOOL   gCalledAppMainline = FALSE;
+
+static NSString *getApplicationName(void)
+{
+    NSDictionary *dict;
+    NSString *appName = 0;
+
+    /* Determine the application name */
+    dict = (NSDictionary *)CFBundleGetInfoDictionary(CFBundleGetMainBundle());
+    if (dict)
+        appName = [dict objectForKey: @"CFBundleName"];
+    
+    if (![appName length])
+        appName = [[NSProcessInfo processInfo] processName];
+
+    return appName;
+}
+
+#if SDL_USE_NIB_FILE
+/* A helper category for NSString */
+@interface NSString (ReplaceSubString)
+- (NSString *)stringByReplacingRange:(NSRange)aRange with:(NSString *)aString;
+@end
+#endif
+
+@interface SDLApplication : NSApplication
+@end
+
+@implementation SDLApplication
+/* Invoked from the Quit menu item */
+- (void)terminate:(id)sender
+{
+    /* Post a SDL_QUIT event */
+    SDL_Event event;
+    event.type = SDL_QUIT;
+    SDL_PushEvent(&event);
+}
+@end
+
+/* The main class of the application, the application's delegate */
+@implementation SDLMain
+
+/* Set the working directory to the .app's parent directory */
+- (void) setupWorkingDirectory:(BOOL)shouldChdir
+{
+	NSString *resourcePath = [[NSBundle mainBundle] resourcePath];
+	[[NSFileManager defaultManager] changeCurrentDirectoryPath:resourcePath];
+}
+
+#if SDL_USE_NIB_FILE
+
+/* Fix menu to contain the real app name instead of "SDL App" */
+- (void)fixMenu:(NSMenu *)aMenu withAppName:(NSString *)appName
+{
+    NSRange aRange;
+    NSEnumerator *enumerator;
+    NSMenuItem *menuItem;
+
+    aRange = [[aMenu title] rangeOfString:@"SDL App"];
+    if (aRange.length != 0)
+        [aMenu setTitle: [[aMenu title] stringByReplacingRange:aRange with:appName]];
+
+    enumerator = [[aMenu itemArray] objectEnumerator];
+    while ((menuItem = [enumerator nextObject]))
+    {
+        aRange = [[menuItem title] rangeOfString:@"SDL App"];
+        if (aRange.length != 0)
+            [menuItem setTitle: [[menuItem title] stringByReplacingRange:aRange with:appName]];
+        if ([menuItem hasSubmenu])
+            [self fixMenu:[menuItem submenu] withAppName:appName];
+    }
+    [ aMenu sizeToFit ];
+}
+
+#else
+
+static void setApplicationMenu(void)
+{
+    /* warning: this code is very odd */
+    NSMenu *appleMenu;
+    NSMenuItem *menuItem;
+    NSString *title;
+    NSString *appName;
+    
+    appName = getApplicationName();
+    appleMenu = [[NSMenu alloc] initWithTitle:@""];
+    
+    /* Add menu items */
+    title = [@"About " stringByAppendingString:appName];
+    [appleMenu addItemWithTitle:title action:@selector(orderFrontStandardAboutPanel:) keyEquivalent:@""];
+
+    [appleMenu addItem:[NSMenuItem separatorItem]];
+
+    title = [@"Hide " stringByAppendingString:appName];
+    [appleMenu addItemWithTitle:title action:@selector(hide:) keyEquivalent:@"h"];
+
+    menuItem = (NSMenuItem *)[appleMenu addItemWithTitle:@"Hide Others" action:@selector(hideOtherApplications:) keyEquivalent:@"h"];
+    [menuItem setKeyEquivalentModifierMask:(NSAlternateKeyMask|NSCommandKeyMask)];
+
+    [appleMenu addItemWithTitle:@"Show All" action:@selector(unhideAllApplications:) keyEquivalent:@""];
+
+    [appleMenu addItem:[NSMenuItem separatorItem]];
+
+    title = [@"Quit " stringByAppendingString:appName];
+    [appleMenu addItemWithTitle:title action:@selector(terminate:) keyEquivalent:@"q"];
+
+    
+    /* Put menu into the menubar */
+    menuItem = [[NSMenuItem alloc] initWithTitle:@"" action:nil keyEquivalent:@""];
+    [menuItem setSubmenu:appleMenu];
+    [[NSApp mainMenu] addItem:menuItem];
+
+    /* Tell the application object that this is now the application menu */
+    [NSApp setAppleMenu:appleMenu];
+
+    /* Finally give up our references to the objects */
+    [appleMenu release];
+    [menuItem release];
+}
+
+/* Create a window menu */
+static void setupWindowMenu(void)
+{
+    NSMenu      *windowMenu;
+    NSMenuItem  *windowMenuItem;
+    NSMenuItem  *menuItem;
+
+    windowMenu = [[NSMenu alloc] initWithTitle:@"Window"];
+    
+    /* "Minimize" item */
+    menuItem = [[NSMenuItem alloc] initWithTitle:@"Minimize" action:@selector(performMiniaturize:) keyEquivalent:@"m"];
+    [windowMenu addItem:menuItem];
+    [menuItem release];
+    
+    /* Put menu into the menubar */
+    windowMenuItem = [[NSMenuItem alloc] initWithTitle:@"Window" action:nil keyEquivalent:@""];
+    [windowMenuItem setSubmenu:windowMenu];
+    [[NSApp mainMenu] addItem:windowMenuItem];
+    
+    /* Tell the application object that this is now the window menu */
+    [NSApp setWindowsMenu:windowMenu];
+
+    /* Finally give up our references to the objects */
+    [windowMenu release];
+    [windowMenuItem release];
+}
+
+/* Replacement for NSApplicationMain */
+static void CustomApplicationMain (int argc, char **argv)
+{
+    NSAutoreleasePool	*pool = [[NSAutoreleasePool alloc] init];
+    SDLMain				*sdlMain;
+
+    /* Ensure the application object is initialised */
+    [SDLApplication sharedApplication];
+    
+#ifdef SDL_USE_CPS
+    {
+        CPSProcessSerNum PSN;
+        /* Tell the dock about us */
+        if (!CPSGetCurrentProcess(&PSN))
+            if (!CPSEnableForegroundOperation(&PSN,0x03,0x3C,0x2C,0x1103))
+                if (!CPSSetFrontProcess(&PSN))
+                    [SDLApplication sharedApplication];
+    }
+#endif /* SDL_USE_CPS */
+
+    /* Set up the menubar */
+    [NSApp setMainMenu:[[NSMenu alloc] init]];
+    setApplicationMenu();
+    setupWindowMenu();
+
+    /* Create SDLMain and make it the app delegate */
+    sdlMain = [[SDLMain alloc] init];
+    [NSApp setDelegate:sdlMain];
+    
+    /* Start the main event loop */
+    [NSApp run];
+    
+    [sdlMain release];
+    [pool release];
+}
+
+#endif
+
+
+/*
+ * Catch document open requests...this lets us notice files when the app
+ *  was launched by double-clicking a document, or when a document was
+ *  dragged/dropped on the app's icon. You need to have a
+ *  CFBundleDocumentsType section in your Info.plist to get this message,
+ *  apparently.
+ *
+ * Files are added to gArgv, so to the app, they'll look like command line
+ *  arguments. Previously, apps launched from the finder had nothing but
+ *  an argv[0].
+ *
+ * This message may be received multiple times to open several docs on launch.
+ *
+ * This message is ignored once the app's mainline has been called.
+ */
+- (BOOL)application:(NSApplication *)theApplication openFile:(NSString *)filename
+{
+    const char *temparg;
+    size_t arglen;
+    char *arg;
+    char **newargv;
+
+    if (!gFinderLaunch)  /* MacOS is passing command line args. */
+        return FALSE;
+
+    if (gCalledAppMainline)  /* app has started, ignore this document. */
+        return FALSE;
+
+    temparg = [filename UTF8String];
+    arglen = SDL_strlen(temparg) + 1;
+    arg = (char *) SDL_malloc(arglen);
+    if (arg == NULL)
+        return FALSE;
+
+    newargv = (char **) realloc(gArgv, sizeof (char *) * (gArgc + 2));
+    if (newargv == NULL)
+    {
+        SDL_free(arg);
+        return FALSE;
+    }
+    gArgv = newargv;
+
+    SDL_strlcpy(arg, temparg, arglen);
+    gArgv[gArgc++] = arg;
+    gArgv[gArgc] = NULL;
+    return TRUE;
+}
+
+
+/* Called when the internal event loop has just started running */
+- (void) applicationDidFinishLaunching: (NSNotification *) note
+{
+    int status;
+
+    /* Set the working directory to the .app's parent directory */
+    [self setupWorkingDirectory:gFinderLaunch];
+
+#if SDL_USE_NIB_FILE
+    /* Set the main menu to contain the real app name instead of "SDL App" */
+    [self fixMenu:[NSApp mainMenu] withAppName:getApplicationName()];
+#endif
+
+    /* Hand off to main application code */
+    gCalledAppMainline = TRUE;
+    status = SDL_main (gArgc, gArgv);
+
+    /* We're done, thank you for playing */
+    exit(status);
+}
+@end
+
+
+@implementation NSString (ReplaceSubString)
+
+- (NSString *)stringByReplacingRange:(NSRange)aRange with:(NSString *)aString
+{
+    unsigned int bufferSize;
+    unsigned int selfLen = [self length];
+    unsigned int aStringLen = [aString length];
+    unichar *buffer;
+    NSRange localRange;
+    NSString *result;
+
+    bufferSize = selfLen + aStringLen - aRange.length;
+    buffer = NSAllocateMemoryPages(bufferSize*sizeof(unichar));
+    
+    /* Get first part into buffer */
+    localRange.location = 0;
+    localRange.length = aRange.location;
+    [self getCharacters:buffer range:localRange];
+    
+    /* Get middle part into buffer */
+    localRange.location = 0;
+    localRange.length = aStringLen;
+    [aString getCharacters:(buffer+aRange.location) range:localRange];
+     
+    /* Get last part into buffer */
+    localRange.location = aRange.location + aRange.length;
+    localRange.length = selfLen - localRange.location;
+    [self getCharacters:(buffer+aRange.location+aStringLen) range:localRange];
+    
+    /* Build output string */
+    result = [NSString stringWithCharacters:buffer length:bufferSize];
+    
+    NSDeallocateMemoryPages(buffer, bufferSize);
+    
+    return result;
+}
+
+@end
+
+
+
+#ifdef main
+#  undef main
+#endif
+
+@interface ServerView : NSTextView
+{
+	NSTask *task;
+	NSFileHandle *file;
+}
+- (void)listenTo: (NSTask*)t;
+@end
+
+@implementation ServerView
+- (void)listenTo: (NSTask*)t;
+{
+	NSPipe *pipe;
+	task = t;
+    pipe = [NSPipe pipe];
+    [task setStandardOutput: pipe];
+    file = [pipe fileHandleForReading];
+
+	[[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(outputNotification:) name: NSFileHandleReadCompletionNotification object: file];
+
+	[file readInBackgroundAndNotify];
+}
+
+- (void) outputNotification: (NSNotification *) notification
+{
+	NSData *data = [[[notification userInfo] objectForKey: NSFileHandleNotificationDataItem] retain];
+	NSString *string = [[NSString alloc] initWithData: data encoding: NSASCIIStringEncoding];
+
+	NSRange end = NSMakeRange([[self string] length], 0);
+
+	[self replaceCharactersInRange: end withString: string];
+	end.location += [string length];
+	[self scrollRangeToVisible: end];
+
+	[string release];
+	[file readInBackgroundAndNotify];
+}
+
+-(void)windowWillClose:(NSNotification *)notification
+{
+	[task terminate];
+    [NSApp terminate:self];
+}
+@end
+
+void runServer()
+{
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    NSApp = [NSApplication sharedApplication];
+	NSBundle* mainBundle = [NSBundle mainBundle];
+	NSTask *task;
+    task = [[NSTask alloc] init];
+	[task setCurrentDirectoryPath: [mainBundle resourcePath]]; 
+
+	// run server
+	NSWindow *window;
+	ServerView *view;
+	NSRect graphicsRect;
+
+	graphicsRect = NSMakeRect(100.0, 1000.0, 600.0, 400.0);
+
+	window = [[NSWindow alloc]
+		initWithContentRect: graphicsRect
+		styleMask: NSTitledWindowMask 
+		| NSClosableWindowMask 
+		| NSMiniaturizableWindowMask
+		backing: NSBackingStoreBuffered
+		defer: NO];
+
+	[window setTitle: @"Teewars Server"];
+
+	view = [[[ServerView alloc] initWithFrame: graphicsRect] autorelease];
+	[view setEditable: NO];
+
+	[window setContentView: view];
+	[window setDelegate: view];
+	[window makeKeyAndOrderFront: nil];
+
+	[view listenTo: task];
+	[task setLaunchPath: [mainBundle pathForAuxiliaryExecutable: @"teeworlds_srv"]];
+	[task launch];
+	[NSApp run];
+	[task terminate];
+
+    [NSApp release];
+    [pool release];
+}
+
+
+/* Main entry point to executable - should *not* be SDL_main! */
+int main (int argc, char **argv)
+{
+	UInt32 mod = GetCurrentKeyModifiers();
+
+    /* Copy the arguments into a global variable */
+    /* This is passed if we are launched by double-clicking */
+    if ( argc >= 2 && strncmp (argv[1], "-psn", 4) == 0 ) {
+        gArgv = (char **) SDL_malloc(sizeof (char *) * 2);
+        gArgv[0] = argv[0];
+        gArgv[1] = NULL;
+        gArgc = 1;
+        gFinderLaunch = YES;
+    } else {
+        int i;
+        gArgc = argc;
+        gArgv = (char **) SDL_malloc(sizeof (char *) * (argc+1));
+        for (i = 0; i <= argc; i++)
+            gArgv[i] = argv[i];
+        gFinderLaunch = NO;
+    }
+
+	if(mod & optionKey)
+	{
+		runServer();
+	}
+	else
+	{
+#if SDL_USE_NIB_FILE
+    	[SDLApplication poseAsClass:[NSApplication class]];
+    	NSApplicationMain (argc, argv);
+#else
+    	CustomApplicationMain (argc, argv);
+#endif
+	}
+
+    return 0;
+}
+
diff --git a/src/osxlaunch/main.m b/src/osxlaunch/main.m
deleted file mode 100644
index a2c5dba5..00000000
--- a/src/osxlaunch/main.m
+++ /dev/null
@@ -1,101 +0,0 @@
-#import <Cocoa/Cocoa.h>
-#include <Carbon/Carbon.h>
-
-@interface ServerView : NSTextView
-{
-	NSTask *task;
-	NSFileHandle *file;
-}
-- (void)listenTo: (NSTask*)t;
-@end
-
-@implementation ServerView
-- (void)listenTo: (NSTask*)t;
-{
-	NSPipe *pipe;
-	task = t;
-    pipe = [NSPipe pipe];
-    [task setStandardOutput: pipe];
-    file = [pipe fileHandleForReading];
-
-	[[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(outputNotification:) name: NSFileHandleReadCompletionNotification object: file];
-
-	[file readInBackgroundAndNotify];
-}
-
-- (void) outputNotification: (NSNotification *) notification
-{
-	NSData *data = [[[notification userInfo] objectForKey: NSFileHandleNotificationDataItem] retain];
-	NSString *string = [[NSString alloc] initWithData: data encoding: NSASCIIStringEncoding];
-
-	NSRange end = NSMakeRange([[self string] length], 0);
-
-	[self replaceCharactersInRange: end withString: string];
-	end.location += [string length];
-	[self scrollRangeToVisible: end];
-
-	[string release];
-	[file readInBackgroundAndNotify];
-}
-
--(void)windowWillClose:(NSNotification *)notification
-{
-	[task terminate];
-    [NSApp terminate:self];
-}
-@end
-
-int main(int argc, char **argv)
-{
-	UInt32 mod = GetCurrentKeyModifiers();
-
-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-    NSApp = [NSApplication sharedApplication];
-	NSBundle* mainBundle = [NSBundle mainBundle];
-	NSTask *task;
-    task = [[NSTask alloc] init];
-	[task setCurrentDirectoryPath: [mainBundle resourcePath]]; 
-
-	if(mod & optionKey)
-	{
-		// run server
-		NSWindow *window;
-		ServerView *view;
-		NSRect graphicsRect;
-
-		graphicsRect = NSMakeRect(100.0, 1000.0, 600.0, 400.0);
-
-		window = [[NSWindow alloc]
-			initWithContentRect: graphicsRect
-			styleMask: NSTitledWindowMask 
-			 | NSClosableWindowMask 
-			 | NSMiniaturizableWindowMask
-			backing: NSBackingStoreBuffered
-			defer: NO];
-
-		[window setTitle: @"Teewars Server"];
-
-		view = [[[ServerView alloc] initWithFrame: graphicsRect] autorelease];
-		[view setEditable: NO];
-
-		[window setContentView: view];
-		[window setDelegate: view];
-		[window makeKeyAndOrderFront: nil];
-
-		[view listenTo: task];
-		[task setLaunchPath: [mainBundle pathForAuxiliaryExecutable: @"teeworlds_srv"]];
-		[task launch];
-		[NSApp run];
-		[task terminate];
-	}
-	else
-	{
-		// run client
-		[task setLaunchPath: [mainBundle pathForAuxiliaryExecutable: @"teeworlds"]];
-		[task launch];
-	}
-
-    [NSApp release];
-    [pool release];
-    return(EXIT_SUCCESS);
-}