fix nightly build breaks

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@403 127b21dd-08f5-0310-b4b7-95ae10353056

src/Core/GuiDisplayGen.h

@@ -76,7 +76,7 @@ extern int debug;
 	
 	OOSound			*guiclick;
 
-#ifdef WIN32
+#ifdef GNUSTEP
 	SDLImage		*backgroundImage;
 #else
 	NSImage			*backgroundImage;
@@ -168,7 +168,7 @@ extern int debug;
 
 - (void) scrollUp:(int) how_much;
 
-#ifdef WIN32
+#ifdef GNUSTEP
 - (void) setBackgroundImage:(SDLImage *) bg_image;
 #else
 - (void) setBackgroundImage:(NSImage *) bg_image;

src/Core/GuiDisplayGen.m

@@ -567,7 +567,7 @@ Your fair use and other rights are in no way affected by the above.
 }
 
 
-#ifdef WIN32
+#ifdef GNUSTEP
 - (void) setBackgroundImage:(SDLImage *) bg_image;
 #else
 - (void) setBackgroundImage:(NSImage *) bg_image;

src/Core/HeadUpDisplay.m

@@ -175,7 +175,7 @@ GLuint ascii_texture_name;
 	if ([info objectForKey:IMAGE_KEY])
 	{
 		//NSLog(@"DEBUG adding Legend %@",[info objectForKey:IMAGE_KEY]);
-#ifdef WIN32
+#ifdef GNUSTEP
 		SDLImage		*legendImage = [ResourceManager surfaceNamed:(NSString *)[info objectForKey:IMAGE_KEY] inFolder:@"Images"];
 #else
 		NSImage			*legendImage = [ResourceManager imageNamed:(NSString *)[info objectForKey:IMAGE_KEY] inFolder:@"Images"];

src/Core/OOCocoa.h

@@ -17,9 +17,86 @@
 typedef int32_t CGMouseDelta;
 
 #import "Comparison.h"
+#import "OOColor.h"
 
 typedef char Str255[256];
 
+/* Define AppKit constants for events */
+enum {
+  NSUpArrowFunctionKey = 0xF700,
+  NSDownArrowFunctionKey = 0xF701,
+  NSLeftArrowFunctionKey = 0xF702,
+  NSRightArrowFunctionKey = 0xF703,
+  NSF1FunctionKey  = 0xF704,
+  NSF2FunctionKey  = 0xF705,
+  NSF3FunctionKey  = 0xF706,
+  NSF4FunctionKey  = 0xF707,
+  NSF5FunctionKey  = 0xF708,
+  NSF6FunctionKey  = 0xF709,
+  NSF7FunctionKey  = 0xF70A,
+  NSF8FunctionKey  = 0xF70B,
+  NSF9FunctionKey  = 0xF70C,
+  NSF10FunctionKey = 0xF70D,
+  NSF11FunctionKey = 0xF70E,
+  NSF12FunctionKey = 0xF70F,
+  NSF13FunctionKey = 0xF710,
+  NSF14FunctionKey = 0xF711,
+  NSF15FunctionKey = 0xF712,
+  NSF16FunctionKey = 0xF713,
+  NSF17FunctionKey = 0xF714,
+  NSF18FunctionKey = 0xF715,
+  NSF19FunctionKey = 0xF716,
+  NSF20FunctionKey = 0xF717,
+  NSF21FunctionKey = 0xF718,
+  NSF22FunctionKey = 0xF719,
+  NSF23FunctionKey = 0xF71A,
+  NSF24FunctionKey = 0xF71B,
+  NSF25FunctionKey = 0xF71C,
+  NSF26FunctionKey = 0xF71D,
+  NSF27FunctionKey = 0xF71E,
+  NSF28FunctionKey = 0xF71F,
+  NSF29FunctionKey = 0xF720,
+  NSF30FunctionKey = 0xF721,
+  NSF31FunctionKey = 0xF722,
+  NSF32FunctionKey = 0xF723,
+  NSF33FunctionKey = 0xF724,
+  NSF34FunctionKey = 0xF725,
+  NSF35FunctionKey = 0xF726,
+  NSInsertFunctionKey = 0xF727,
+  NSDeleteFunctionKey = 0xF728,
+  NSHomeFunctionKey = 0xF729,
+  NSBeginFunctionKey = 0xF72A,
+  NSEndFunctionKey = 0xF72B,
+  NSPageUpFunctionKey = 0xF72C,
+  NSPageDownFunctionKey = 0xF72D,
+  NSPrintScreenFunctionKey = 0xF72E,
+  NSScrollLockFunctionKey = 0xF72F,
+  NSPauseFunctionKey = 0xF730,
+  NSSysReqFunctionKey = 0xF731,
+  NSBreakFunctionKey = 0xF732,
+  NSResetFunctionKey = 0xF733,
+  NSStopFunctionKey = 0xF734,
+  NSMenuFunctionKey = 0xF735,
+  NSUserFunctionKey = 0xF736,
+  NSSystemFunctionKey = 0xF737,
+  NSPrintFunctionKey = 0xF738,
+  NSClearLineFunctionKey = 0xF739,
+  NSClearDisplayFunctionKey = 0xF73A,
+  NSInsertLineFunctionKey = 0xF73B,
+  NSDeleteLineFunctionKey = 0xF73C,
+  NSInsertCharFunctionKey = 0xF73D,
+  NSDeleteCharFunctionKey = 0xF73E,
+  NSPrevFunctionKey = 0xF73F,
+  NSNextFunctionKey = 0xF740,
+  NSSelectFunctionKey = 0xF741,
+  NSExecuteFunctionKey = 0xF742,
+  NSUndoFunctionKey = 0xF743,
+  NSRedoFunctionKey = 0xF744,
+  NSFindFunctionKey = 0xF745,
+  NSHelpFunctionKey = 0xF746,
+  NSModeSwitchFunctionKey = 0xF747
+};
+
 /* Define the application support cache dir */
 #define OOLITE_CACHE  [[[NSHomeDirectory() \
                   stringByAppendingPathComponent:@"GNUstep"] \
@@ -37,4 +114,8 @@ typedef char Str255[256];
 
 #import <math.h>
 #import <Foundation/Foundation.h>
+
+#ifndef GNUSTEP
 #import <AppKit/AppKit.h>
+#endif
+

src/Core/OpenGLSprite.h

@@ -66,7 +66,7 @@ extern int debug;
 - (id) initWithImage:(NSImage *)textureImage cropRectangle:(NSRect)cropRect size:(NSSize) spriteSize;
 #endif
 - (id) initWithText:(NSString *)str;
-- (id) initWithText:(NSString *)str ofColor:(NSColor *) textColor;
+- (id) initWithText:(NSString *)str ofColor:(OOColor *) textColor;
 - (void) dealloc;
 
 - (NSSize)  size;

src/Core/OpenGLSprite.m

@@ -49,6 +49,7 @@ Your fair use and other rights are in no way affected by the above.
     return self;
 }
 
+#ifndef GNUSTEP
 - (id) initWithImage:(NSImage *)textureImage cropRectangle:(NSRect)cropRect size:(NSSize) spriteSize
 {
     self = [super init];
@@ -56,13 +57,14 @@ Your fair use and other rights are in no way affected by the above.
     return self;
 
 }
+#endif
 
 - (id) initWithText:(NSString *)str
 {
     return [self initWithText:str ofColor:[OOColor yellowColor]];
 }
 
-- (id) initWithText:(NSString *)str ofColor:(NSColor *) textColor
+- (id) initWithText:(NSString *)str ofColor:(OOColor *) textColor
 {
 #ifndef GNUSTEP
     NSImage	*image;

src/Core/PlayerEntity.h

@@ -242,7 +242,7 @@ enum
 	
 	NSMutableArray*			comm_log;
 
-#ifdef WIN32
+#ifdef GNUSTEP
  	SDLImage				*missionBackgroundImage;
 #else
 	NSImage					*missionBackgroundImage;