OS X: Add a preliminary Xcode project. DONT_BUILD.

git-svn-id: https://svn.eduke32.com/eduke32@4646 1a8010ca-5511-0410-912e-c29ae57300e0

polymer/eduke32/Makefile

@@ -291,7 +291,7 @@ ifeq ($(SUBPLATFORM),LINUX)
 endif
 
 ifeq ($(PLATFORM),DARWIN)
-    LIBDIRS += -L$(AUDIOLIB_ROOT)/third-party/Apple/lib
+    # LIBDIRS += -L$(AUDIOLIB_ROOT)/third-party/Apple/lib
 
     LIBS += -lFLAC -lvorbisfile -lvorbis -logg -lm \
             -Wl,-framework,Cocoa -Wl,-framework,Carbon -Wl,-framework,OpenGL \

polymer/eduke32/Makefile.common

@@ -663,8 +663,8 @@ ifeq ($(PLATFORM),DARWIN)
     ASFORMAT=macho$(SYSBITS)
     ASFLAGS+= -DUNDERSCORES
 
-    LIBDIRS+= -Lplatform/Apple/lib
+    # LIBDIRS+= -Lplatform/Apple/lib
-    COMPILERFLAGS+= -Iplatform/Apple/include
+    # COMPILERFLAGS+= -Iplatform/Apple/include
 
     ifneq ($(shell port --version &>/dev/null; echo $$?),127)
         LIBDIRS+= -L/opt/local/lib

polymer/eduke32/build/src/SDLMain.m

@@ -5,7 +5,11 @@
     Feel free to customize this file to suit your needs
 */
 
+#import <Foundation/Foundation.h>
+#import <AppKit/AppKit.h>
+
 #include "sdl_inc.h"
+#include "SDLMain.h"
 
 #include <sys/param.h> /* for MAXPATHLEN */
 #include <unistd.h>
@@ -71,7 +75,7 @@ static NSString *getApplicationName(void)
 
 @implementation NSApplication (SDLApplication)
 /* Invoked from the Quit menu item */
-- (void)terminate:(id)sender
+- (void)terminateCall:(id)sender
 {
     /* Post a SDL_QUIT event */
     SDL_Event event;
@@ -80,8 +84,11 @@ static NSString *getApplicationName(void)
 }
 @end
 
+@interface SDLMain (NSObject)
+@end
+
 /* The main class of the application, the application's delegate */
-@implementation SDLMain
+@implementation SDLMain (NSObject)
 
 /* Set the working directory to the .app's parent directory */
 - (void) setupWorkingDirectory:(BOOL)shouldChdir
@@ -153,7 +160,7 @@ static void setApplicationMenu(void)
     [appleMenu addItem:[NSMenuItem separatorItem]];
 
     title = [@"Quit " stringByAppendingString:appName];
-    [appleMenu addItemWithTitle:title action:@selector(terminate:) keyEquivalent:@"q"];
+    [appleMenu addItemWithTitle:title action:@selector(terminateCall:) keyEquivalent:@"q"];
 
 
     /* Put menu into the menubar */
@@ -380,4 +387,3 @@ int main (int argc, char **argv)
 #endif
     return 0;
 }
-

polymer/eduke32/platform/Apple/bundles/EDuke32.app/Contents/Info.plist

@@ -1,5 +1,5 @@
 <?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">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
@@ -13,28 +13,30 @@
 	<key>CFBundleIconFile</key>
 	<string>eduke32.icns</string>
 	<key>CFBundleIdentifier</key>
-        <string>com.eduke32</string>
+	<string>com.voidpoint.eduke32</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
 	<string>EDuke32</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
-	<key>CFBundleSignature</key>
-	<string>ED32</string>
 	<key>CFBundleShortVersionString</key>
 	<string>2.0</string>
+	<key>CFBundleSignature</key>
+	<string>ED32</string>
 	<key>CFBundleVersion</key>
 	<string>2.0</string>
-        <key>CSResourcesFileMapped</key>
-        <true/>
-	<key>NSMainNibFile</key>
-	<string>game.osxmain</string>
-	<key>NSHumanReadableCopyright</key>
-	<string>Copyright EDuke32 Team</string>
-	<key>NSPrincipalClass</key>
-	<string>NSApplication</string>
 	<key>CGDisableCoalescedUpdates</key>
 	<true/>
+	<key>CSResourcesFileMapped</key>
+	<true/>
+	<key>LSApplicationCategoryType</key>
+	<string>public.app-category.action-games</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright Voidpoint, LLC</string>
+	<key>NSMainNibFile</key>
+	<string>game.osxmain</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
 </dict>
 </plist>

polymer/eduke32/platform/Apple/bundles/Mapster32.app/Contents/Info.plist

@@ -1,5 +1,5 @@
 <?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">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
@@ -13,28 +13,28 @@
 	<key>CFBundleIconFile</key>
 	<string>mapster32.icns</string>
 	<key>CFBundleIdentifier</key>
-        <string>com.eduke32.mapster32</string>
+	<string>com.voidpoint.mapster32</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
 	<string>Mapster32</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
-	<key>CFBundleSignature</key>
-	<string>MP32</string>
 	<key>CFBundleShortVersionString</key>
 	<string>2.0</string>
+	<key>CFBundleSignature</key>
+	<string>MP32</string>
 	<key>CFBundleVersion</key>
 	<string>2.0</string>
-        <key>CSResourcesFileMapped</key>
-        <true/>
-	<key>NSMainNibFile</key>
-	<string>build.osxmain</string>
-	<key>NSHumanReadableCopyright</key>
-	<string>Copyright EDuke32 Team</string>
-	<key>NSPrincipalClass</key>
-	<string>NSApplication</string>
 	<key>CGDisableCoalescedUpdates</key>
 	<true/>
+	<key>CSResourcesFileMapped</key>
+	<true/>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright Voidpoint, LLC</string>
+	<key>NSMainNibFile</key>
+	<string>build.osxmain</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
 </dict>
 </plist>

polymer/eduke32/source/enet/src/unix.c

@@ -69,6 +69,9 @@ enet_deinitialize (void)
 {
 }
 
+// Why, Xcode? Why?
+time_t time(time_t *);
+
 enet_uint32
 enet_host_random_seed (void)
 {