Removed reference to rotozoom include from SDL_gfx, and took SDL folder out of includes again... for some reason this was required yesterday, but broke the compilation today.

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

src/SDL/JoystickHandler.h

@@ -8,7 +8,7 @@
 // JoystickHandler handles joystick events from SDL, and translates them
 // into the appropriate action via a lookup table. The lookup table is
 // stored as a simple array rather than an ObjC dictionary since this
-// will be examined fairly often (once per frame during gameplay). 
+// will be examined fairly often (once per frame during gameplay).
 //
 // Conversion methods are provided to convert between the internal
 // representation and an NSDictionary (for loading/saving user defaults
@@ -93,7 +93,7 @@ enum {
 #define ENUMKEY(x) [NSString stringWithFormat: @"%d", x]
 
 #import <Foundation/Foundation.h>
-#import <SDL/SDL.h>
+#import <SDL.h>
 
 @interface JoystickHandler : NSObject
 {
@@ -128,10 +128,10 @@ enum {
 - (NSPoint) getRollPitchAxis;
 
 // Setting button and axis functions
-- (void) setFunctionForAxis: (int)axis 
-                   function: (int)function 
+- (void) setFunctionForAxis: (int)axis
+                   function: (int)function
                       stick: (int)stickNum;
-- (void) setFunctionForButton: (int)button 
+- (void) setFunctionForButton: (int)button
                      function: (int)function
                         stick: (int)stickNum;
 // convert a dictionary into the internal function map
@@ -160,10 +160,10 @@ enum {
 
 // Set a callback for the next moved axis/pressed button. hwflags
 // is in the form HW_AXIS | HW_BUTTON (or just one of).
-- (void)setCallback: (SEL)selector 
-             object: (id)obj 
+- (void)setCallback: (SEL)selector
+             object: (id)obj
            hardware: (char)hwflags;
-- (void)clearCallback;           
+- (void)clearCallback;
 
 // Methods generally only used by this class.
 - (void) setDefaultMapping;

src/SDL/MyOpenGLView.h

@@ -39,7 +39,7 @@ Your fair use and other rights are in no way affected by the above.
 #import "OOOpenGL.h"
 
 #ifdef GNUSTEP
-#include <SDL/SDL.h>
+#include <SDL.h>
 #endif
 
 #define MAX_CLEAR_DEPTH		100000000.0
@@ -102,7 +102,7 @@ extern int debug;
 @interface MyOpenGLView : OpenGLViewSuperClass
 {
 	GameController		*gameController;
-#ifndef GNUSTEP	
+#ifndef GNUSTEP
 	OpenGLSprite		*splashSprite;
 #endif
 	BOOL				keys[NUM_KEYS];
@@ -111,31 +111,31 @@ extern int debug;
 	BOOL				opt, ctrl, command, shift;
 	BOOL				allowingStringInput;
 	BOOL				isAlphabetKeyDown;
-	
+
 	int					keycodetrans[255];
-	
+
 	BOOL				m_glContextInitialized;
     NSPoint				mouseDragStartPoint;
-	
+
 	NSTimeInterval		timeIntervalAtLastClick;
 	BOOL				doubleClick;
-	
+
 	NSMutableString		*typedString;
-	
+
 	NSPoint				virtualJoystickPosition;
-	
+
 	NSSize				viewSize;
 	GLfloat				display_z;
-	
+
 #ifdef GNUSTEP
     double				squareX,squareY;
 	NSRect				bounds;
-	
+
    // Full screen sizes
 	NSMutableArray		*screenSizes;
 	int					currentSize;
 	BOOL				fullScreen;
-	
+
 	// Windowed mode
 	NSSize currentWindowSize;
 	SDL_Surface* surface;
@@ -190,7 +190,7 @@ extern int debug;
 
  - (void) pollControls: (id)sender;
  - (void) handleStringInput: (SDL_KeyboardEvent *) kbd_event; // DJS
- - (JoystickHandler *)getStickHandler; // DJS                       
+ - (JoystickHandler *)getStickHandler; // DJS
 #endif
 
 - (void) setVirtualJoystick:(double) vmx :(double) vmy;

src/SDL/SDLImage.h

@@ -10,7 +10,6 @@
 
 #include <SDL.h>
 #include <SDL_image.h>
-#include <SDL_rotozoom.h>
 
 @interface SDLImage : NSObject
 {