Droog71/oolite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add extra sound files, modify GNUmakefile.postamble with Giles's recommendations, add math.h to oolite-linux.h to prevent nasty bug caused by something weird happening in the floor() function

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Dylan Smith 2005-04-20 19:55:51 +00:00
parent ca9a24718d
commit 9379419ba6
4 changed files with 36 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
GNUmakefile.postamble
View File

@ -3,8 +3,33 @@
# These copy all the base data files into where oolite expects them
# to live (Contents/Resources)
#
CONTENTS = Contents
RESOURCES = Resources
INSTDIR = $(APP_NAME).app/$(CONTENTS)/$(RESOURCES)
AIDIR = $(INSTDIR)/AIs
CONFIGDIR = $(INSTDIR)/Config
IMAGEDIR = $(INSTDIR)/Images
TEXTUREDIR = $(INSTDIR)/Textures
SOUNDDIR = $(INSTDIR)/Sounds
MUSICDIR = $(INSTDIR)/Music
MODELDIR = $(INSTDIR)/Models
after-all::
$(MKDIRS) $(APP_NAME).app/Contents
$(MKDIRS) $(APP_NAME).app/Contents/Resources
$(CP) *.png *.plist *.dat $(APP_NAME).app/Contents/Resources
$(MKDIRS) $(INSTDIR)
$(MKDIRS) $(AIDIR)
$(MKDIRS) $(CONFIGDIR)
$(MKDIRS) $(IMAGEDIR)
$(MKDIRS) $(TEXTUREDIR)
$(MKDIRS) $(SOUNDDIR)
$(MKDIRS) $(MUSICDIR)
$(MKDIRS) $(MODELDIR)
$(CP) splash.png $(IMAGEDIR)/splash.png
$(CP) splashback.png $(IMAGEDIR)/splashback.png
$(CP) cursor.png compass.png aegis.png reddot.png greendot.png zoom.png legend* solar.png $(IMAGEDIR)
$(CP) *.png $(TEXTUREDIR)
$(CP) *.aiff $(SOUNDDIR)
# $(CP) *.mp3 *.mid *.mov $(MUSICDIR)
$(CP) *AI.plist $(AIDIR)
$(CP) *.dat $(MODELDIR)
$(CP) *.plist $(CONFIGDIR)

4
GameController.h
View File

@ -48,8 +48,8 @@ Your fair use and other rights are in no way affected by the above.
#define MODE_FULL_SCREEN 200
#define DISPLAY_MIN_COLOURS 32
#define DISPLAY_MIN_WIDTH 640
#define DISPLAY_MIN_HEIGHT 480
#define DISPLAY_MIN_WIDTH 800
#define DISPLAY_MIN_HEIGHT 600
#define DISPLAY_MAX_WIDTH 2400
#define DISPLAY_MAX_HEIGHT 1800

4
GameController.m
View File

@ -322,7 +322,7 @@ static int _compareModes(id arg1, id arg2, void *context)
unsigned int styleMask = NSTitledWindowMask | NSResizableWindowMask | NSMiniaturizableWindowMask;
rect = NSMakeRect (100, 100, 640, 480);
rect = NSMakeRect (100, 100, DISPLAY_MIN_WIDTH, DISPLAY_MIN_HEIGHT);
NSLog(@"GameController.createWindow: creating gameWindow");
gameWindow = [NSWindow alloc];
@ -333,7 +333,7 @@ static int _compareModes(id arg1, id arg2, void *context)
[gameWindow setTitle: @"GNUstep Oolite"];
NSLog(@"GameController.createWindow: creating gameView");
tmpView = [[MyOpenGLView alloc] initWithFrame: NSMakeRect(0, 0, 800, 600) pixelFormat: [NSOpenGLView defaultPixelFormat]];
tmpView = [[MyOpenGLView alloc] initWithFrame: NSMakeRect(0, 0, DISPLAY_MIN_WIDTH, DISPLAY_MIN_HEIGHT) pixelFormat: [NSOpenGLView defaultPixelFormat]];
[gameWindow setContentView: tmpView];
[self setGameView: tmpView];
}

7
oolite-linux.h
View File

@ -9,8 +9,9 @@
*
*/
#include "GL/gl.h"
#include "GL/glu.h"
#include "GL/glext.h"
#include <GL/gl.h>
#include <GL/glu.h>
#include <GL/glext.h>
#include <math.h>
#endif /* OOLITE_LINUX */