Build control additions: silence pointless warnings, provide header file for Linux paths, copy files into the resultant .app

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

GNUmakefile

@@ -1,10 +1,15 @@
 include $(GNUSTEP_MAKEFILES)/common.make
+CP = cp
 GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_USER_ROOT)
 ADDITIONAL_GUI_LIBS = -lGLU -lGL
+ADDITIONAL_CFLAGS = -DLINUX
+ADDITIONAL_OBJCFLAGS = -DLINUX -Wno-import
 APP_NAME = oolite
-oolite_LIB_DIRS += -L/usr/X11R6/lib/ 
+oolite_LIB_DIRS += -L/usr/X11R6/lib/
+
 oolite_C_FILES = vector.c legacy_random.c
 oolite_OBJC_FILES = AI.m DustEntity.m Entity.m GameController.m GuiDisplayGen.m HeadUpDisplay.m main.m MyOpenGLView.m OpenGLSprite.m ParticleEntity.m PlanetEntity.m PlayerEntity_Additions.m PlayerEntity_contracts.m PlayerEntity.m ResourceManager.m RingEntity.m ShipEntity_AI.m ShipEntity.m SkyEntity.m StationEntity.m TextureStore.m Universe.m
 
 include $(GNUSTEP_MAKEFILES)/application.make
+include GNUmakefile.postamble
 

GNUmakefile.postamble

@@ -0,0 +1,10 @@
+# Oolite-linux
+# GNUmakefile.postamble: Runs after-compilation scripts.
+# These copy all the base data files into where oolite expects them
+# to live (Contents/Resources)
+#
+after-all:: 
+	$(MKDIRS) $(APP_NAME).app/Contents
+	$(MKDIRS) $(APP_NAME).app/Contents/Resources
+	$(CP) *.png *.plist *.dat $(APP_NAME).app/Contents/Resources
+

GameController.m

@@ -40,7 +40,12 @@ Your fair use and other rights are in no way affected by the above.
 #import "Universe.h"
 #import "MyOpenGLView.h"
 #import "TextureStore.h"
+
+#ifdef LINUX
+#include "oolite-linux.h"
+#else
 #import <OpenGL/OpenGL.h>
+#endif
 
 @implementation GameController
 

HeadUpDisplay.h

@@ -40,8 +40,12 @@ Your fair use and other rights are in no way affected by the above.
 */
 //
 
+#ifdef LINUX
+#include "oolite-linux.h"
+#else
 #import <OpenGL/gl.h>
 #import <OpenGL/glu.h>
+#endif
 
 #import <Foundation/Foundation.h>
 

MyOpenGLView.h

@@ -41,9 +41,14 @@ Your fair use and other rights are in no way affected by the above.
 #else
 #import <Cocoa/Cocoa.h>
 #endif
+
+#ifdef LINUX
+#include "oolite-linux.h"
+#else
 #import <OpenGL/OpenGL.h>
 #import <OpenGL/gl.h>
 #import <OpenGL/glext.h>
+#endif
 
 #define MAX_CLEAR_DEPTH		100000000.0
 // 100 000 km.

OpenGLSprite.h

@@ -44,8 +44,13 @@ Your fair use and other rights are in no way affected by the above.
 #import <Cocoa/Cocoa.h>
 #endif
 #import <Foundation/Foundation.h>
+
+#ifdef LINUX
+#include "oolite-linux.h"
+#else
 #import <OpenGL/gl.h>
-//#import <OpenGL/glu.h>
+#import <OpenGL/glu.h>
+#endif
 
 #define	OPEN_GL_SPRITE_MIN_WIDTH	64.0
 #define	OPEN_GL_SPRITE_MIN_HEIGHT	64.0

PlanetEntity.m

@@ -37,7 +37,11 @@ Your fair use and other rights are in no way affected by the above.
 
 */
 
+#ifdef LINUX
+#include "oolite-linux.h"
+#else
 #import <OpenGL/gl.h>
+#endif
 
 #import "PlanetEntity.h"
 #import "entities.h"

TextureStore.h

@@ -43,8 +43,12 @@ Your fair use and other rights are in no way affected by the above.
 #else
 #import <Cocoa/Cocoa.h>
 #endif
-#import <OpenGL/gl.h>
 
+#ifdef LINUX
+#include "oolite-linux.h"
+#else
+#import <OpenGL/gl.h>
+#endif
 
 extern int debug;
 

TextureStore.m

@@ -43,7 +43,12 @@ Your fair use and other rights are in no way affected by the above.
 #else
 #import <Cocoa/Cocoa.h>
 #endif
+
+#ifdef LINUX
+#include "oolite-linux.h"
+#else
 #import <OpenGL/gl.h>
+#endif
 
 #import "ResourceManager.h"
 

Universe.h

@@ -150,8 +150,12 @@ Your fair use and other rights are in no way affected by the above.
 
 #define	NUMBER_OF_STRICT_EQUIPMENT_ITEMS	16
 
-#import <OpenGL/gl.h>
 //#import <OpenGL/glu.h>
+#ifdef LINUX
+#include "oolite-linux.h"
+#else
+#import <OpenGL/gl.h>
+#endif
 
 #ifdef GNUSTEP
 #import <Foundation/Foundation.h>

Universe.m

@@ -37,8 +37,12 @@ Your fair use and other rights are in no way affected by the above.
 
 */
 
+#ifdef LINUX
+#include "oolite-linux.h"
+#else
 #import <OpenGL/gl.h>
 #import <OpenGL/glu.h>
+#endif
 
 #import "Universe.h"
 

oolite-linux.h

@@ -0,0 +1,16 @@
+#ifndef OOLITE_LINUX
+#define OOLITE_LINUX
+/* 
+ *
+ * oolite-linux.h: Includes, definitions and pathnames for Linux
+ * systems.
+ *
+ * Dylan Smith, 2005-04-19
+ *
+ */
+
+#include "GL/gl.h"
+#include "GL/glu.h"
+#include "GL/glext.h"
+
+#endif /* OOLITE_LINUX */

vector.h

@@ -40,7 +40,11 @@ Your fair use and other rights are in no way affected by the above.
 
 */
 
+#ifdef LINUX
+#include "oolite-linux.h"
+#else
 #import <OpenGL/gl.h>
+#endif
 
 struct vector
 {