- fix build (include missing header files), after recent gnustep-base update
pointed out by ajacoutot@, naddy@, landry@ - while there, remove use of gcc4 module, and use x11/gnustep module - fix compiler warning regarding 'struct in_addr' declared inside parameter list - update MESSAGE file, to recommend using defaults tool, instead of handcrafting gnustep defaults file OK nicm@ (MAINTAINER), ajacoutot@
This commit is contained in:
sebastia
parent
3698f9e335
commit
8ac5e1dd55
@ -1,8 +1,9 @@
|
||||
# $OpenBSD: Makefile,v 1.3 2010/11/16 11:23:27 espie Exp $
|
||||
# $OpenBSD: Makefile,v 1.4 2011/01/15 10:13:23 sebastia Exp $
|
||||
|
||||
COMMENT= space combat and trading game in the style of Elite
|
||||
|
||||
VERSION= 1.73.4
|
||||
REVISION = 0
|
||||
DISTNAME= oolite-dev-source-${VERSION}
|
||||
PKGNAME= oolite-${VERSION}
|
||||
CATEGORIES= games
|
||||
@ -20,19 +21,15 @@ PERMIT_DISTFILES_FTP= Yes
|
||||
MASTER_SITES= ${MASTER_SITE_BERLIOS:=oolite-linux/}
|
||||
EXTRACT_SUFX= .tar.bz2
|
||||
|
||||
MODULES= gcc4
|
||||
MODGCC4_ARCHES= *
|
||||
MODGCC4_LANGS= c
|
||||
MODULES= x11/gnustep
|
||||
MODGNUSTEP_NEEDS_GUI = No
|
||||
|
||||
LIB_DEPENDS= devel/sdl-mixer \
|
||||
gobjc->=4.2,<4.3|gobjc->=4.2v0,<4.3v0:lang/gcc/4.2,-objc \
|
||||
x11/gnustep/base \
|
||||
graphics/png
|
||||
|
||||
WANTLIB += GL GLU SDL c m pthread SDL_mixer objc gnustep-base png
|
||||
|
||||
USE_GMAKE= Yes
|
||||
MAKE_ENV= GNUSTEP_MAKEFILES=`gnustep-config --variable=GNUSTEP_MAKEFILES`
|
||||
MAKE_FILE = Makefile
|
||||
ALL_TARGET= release
|
||||
|
||||
do-install:
|
||||
|
||||
@ -1,12 +1,13 @@
|
||||
$OpenBSD: patch-GNUmakefile,v 1.1.1.1 2010/04/19 23:44:55 nicm Exp $
|
||||
--- GNUmakefile.orig Sun Aug 30 12:46:42 2009
|
||||
+++ GNUmakefile Wed Mar 31 00:22:10 2010
|
||||
@@ -20,10 +21,10 @@ ifeq ($(GNUSTEP_HOST_OS),mingw32)
|
||||
$OpenBSD: patch-GNUmakefile,v 1.2 2011/01/15 10:13:23 sebastia Exp $
|
||||
--- GNUmakefile.orig Sun Aug 30 13:46:42 2009
|
||||
+++ GNUmakefile Fri Jan 14 11:12:36 2011
|
||||
@@ -20,10 +20,11 @@ ifeq ($(GNUSTEP_HOST_OS),mingw32)
|
||||
else
|
||||
LIBJS_SRC_DIR = deps/Cross-platform-deps/SpiderMonkey/js/src
|
||||
LIBJS_BIN_DIR = $(LIBJS_SRC_DIR)/Linux_All_OPT.OBJ
|
||||
- ADDITIONAL_INCLUDE_DIRS = -I$(LIBJS_SRC_DIR) -I$(LIBJS_BIN_DIR) -Isrc/SDL -Isrc/Core -Isrc/BSDCompat -Isrc/Core/Scripting -Isrc/Core/Materials -Isrc/Core/Entities -Isrc/Core/OXPVerifier -Isrc/Core/Debug
|
||||
+ ADDITIONAL_INCLUDE_DIRS = -I$(LIBJS_SRC_DIR) -I$(LOCALBASE)/include/libpng -I$(LIBJS_BIN_DIR) -Isrc/SDL -Isrc/Core -Isrc/BSDCompat -Isrc/Core/Scripting -Isrc/Core/Materials -Isrc/Core/Entities -Isrc/Core/OXPVerifier -Isrc/Core/Debug
|
||||
+ LIBJS_XCODE_DIR = deps/Cross-platform-deps/SpiderMonkey/js/xcode
|
||||
+ ADDITIONAL_INCLUDE_DIRS = -I$(LIBJS_SRC_DIR) -I$(LOCALBASE)/include/libpng -I$(LIBJS_BIN_DIR) -I$(LIBJS_XCODE_DIR) -Isrc/SDL -Isrc/Core -Isrc/BSDCompat -Isrc/Core/Scripting -Isrc/Core/Materials -Isrc/Core/Entities -Isrc/Core/OXPVerifier -Isrc/Core/Debug
|
||||
ADDITIONAL_OBJC_LIBS = -lpng $(LIBJS_BIN_DIR)/libjs.a -lGLU -lGL -lSDL -lSDL_mixer -lgnustep-base
|
||||
ADDITIONAL_CFLAGS = -DLINUX -DNEED_STRLCPY `sdl-config --cflags`
|
||||
- ADDITIONAL_OBJCFLAGS = -std=c99 -DLOADSAVEGUI -DLINUX -DXP_UNIX -Wno-import `sdl-config --cflags`
|
||||
|
||||
@ -1,7 +1,19 @@
|
||||
$OpenBSD: patch-src_Core_Debug_OODebugTCPConsoleClient_m,v 1.1.1.1 2010/04/19 23:44:55 nicm Exp $
|
||||
--- src/Core/Debug/OODebugTCPConsoleClient.m.orig Wed Mar 31 21:55:57 2010
|
||||
+++ src/Core/Debug/OODebugTCPConsoleClient.m Wed Mar 31 21:56:52 2010
|
||||
@@ -157,7 +157,7 @@ OOINLINE BOOL StatusIsSendable(OOTCPClientConnectionSt
|
||||
$OpenBSD: patch-src_Core_Debug_OODebugTCPConsoleClient_m,v 1.2 2011/01/15 10:13:23 sebastia Exp $
|
||||
|
||||
fix: 'struct in_addr' declared inside parameter list
|
||||
|
||||
--- src/Core/Debug/OODebugTCPConsoleClient.m.orig Sun Aug 30 13:40:23 2009
|
||||
+++ src/Core/Debug/OODebugTCPConsoleClient.m Fri Jan 14 13:22:16 2011
|
||||
@@ -40,6 +40,8 @@ SOFTWARE.
|
||||
#if OOLITE_WINDOWS
|
||||
#import <winsock2.h>
|
||||
#else
|
||||
+#include <sys/types.h>
|
||||
+#include <netinet/in.h>
|
||||
#import <arpa/inet.h> // For htonl
|
||||
#endif
|
||||
|
||||
@@ -157,7 +159,7 @@ OOINLINE BOOL StatusIsSendable(OOTCPClientConnectionSt
|
||||
// Attempt to connect
|
||||
parameters = [NSDictionary dictionaryWithObjectsAndKeys:
|
||||
[NSNumber numberWithUnsignedInt:kOOTCPProtocolVersion_1_1_0], kOOTCPProtocolVersion,
|
||||
|
||||
@ -0,0 +1,16 @@
|
||||
$OpenBSD: patch-src_Core_Materials_OOPNGTextureLoader_m,v 1.1 2011/01/15 10:13:23 sebastia Exp $
|
||||
|
||||
missing header
|
||||
|
||||
--- src/Core/Materials/OOPNGTextureLoader.m.orig Fri Jan 14 12:58:52 2011
|
||||
+++ src/Core/Materials/OOPNGTextureLoader.m Fri Jan 14 12:59:09 2011
|
||||
@@ -50,6 +50,9 @@ SOFTWARE.
|
||||
#import "OOFunctionAttributes.h"
|
||||
#import "OOLogging.h"
|
||||
#import "OOCPUInfo.h"
|
||||
+
|
||||
+#include <assert.h>
|
||||
+
|
||||
|
||||
|
||||
void png_error(png_structp, png_const_charp) NO_RETURN_FUNC;
|
||||
16
games/oolite/patches/patch-src_Core_OOAsyncQueue_m
Normal file
16
games/oolite/patches/patch-src_Core_OOAsyncQueue_m
Normal file
@ -0,0 +1,16 @@
|
||||
$OpenBSD: patch-src_Core_OOAsyncQueue_m,v 1.1 2011/01/15 10:13:23 sebastia Exp $
|
||||
|
||||
missing header
|
||||
|
||||
--- src/Core/OOAsyncQueue.m.orig Fri Jan 14 13:19:13 2011
|
||||
+++ src/Core/OOAsyncQueue.m Fri Jan 14 13:19:29 2011
|
||||
@@ -52,6 +52,9 @@ SOFTWARE.
|
||||
#import "OOLogging.h"
|
||||
#import "NSThreadOOExtensions.h"
|
||||
#import <stdlib.h>
|
||||
+
|
||||
+#include <assert.h>
|
||||
+
|
||||
|
||||
|
||||
enum
|
||||
11
games/oolite/patches/patch-src_Core_OOMaths_h
Normal file
11
games/oolite/patches/patch-src_Core_OOMaths_h
Normal file
@ -0,0 +1,11 @@
|
||||
$OpenBSD: patch-src_Core_OOMaths_h,v 1.1 2011/01/15 10:13:23 sebastia Exp $
|
||||
--- src/Core/OOMaths.h.orig Fri Jan 14 12:36:10 2011
|
||||
+++ src/Core/OOMaths.h Fri Jan 14 12:36:45 2011
|
||||
@@ -37,6 +37,7 @@ extern "C" {
|
||||
|
||||
#ifdef __OBJC__
|
||||
#import <Foundation/Foundation.h>
|
||||
+#import <assert.h>
|
||||
#endif
|
||||
|
||||
#include "OOFunctionAttributes.h"
|
||||
16
games/oolite/patches/patch-src_Core_OOPriorityQueue_m
Normal file
16
games/oolite/patches/patch-src_Core_OOPriorityQueue_m
Normal file
@ -0,0 +1,16 @@
|
||||
$OpenBSD: patch-src_Core_OOPriorityQueue_m,v 1.1 2011/01/15 10:13:23 sebastia Exp $
|
||||
|
||||
missing header
|
||||
|
||||
--- src/Core/OOPriorityQueue.m.orig Fri Jan 14 13:03:08 2011
|
||||
+++ src/Core/OOPriorityQueue.m Fri Jan 14 13:03:25 2011
|
||||
@@ -28,6 +28,9 @@ SOFTWARE.
|
||||
|
||||
#import "OOPriorityQueue.h"
|
||||
#import "OOFunctionAttributes.h"
|
||||
+
|
||||
+#include <assert.h>
|
||||
+
|
||||
|
||||
|
||||
/* Capacity grows by 50% each time. kMinCapacity must be at least 2 or Bad
|
||||
@ -0,0 +1,16 @@
|
||||
$OpenBSD: patch-src_Core_OXPVerifier_OOOXPVerifierStage_m,v 1.1 2011/01/15 10:13:23 sebastia Exp $
|
||||
|
||||
missing header
|
||||
|
||||
--- src/Core/OXPVerifier/OOOXPVerifierStage.m.orig Fri Jan 14 12:59:57 2011
|
||||
+++ src/Core/OXPVerifier/OOOXPVerifierStage.m Fri Jan 14 13:00:15 2011
|
||||
@@ -47,6 +47,9 @@ SOFTWARE.
|
||||
*/
|
||||
|
||||
#import "OOOXPVerifierStageInternal.h"
|
||||
+
|
||||
+#include <assert.h>
|
||||
+
|
||||
|
||||
#if OO_OXP_VERIFIER_ENABLED
|
||||
|
||||
@ -0,0 +1,16 @@
|
||||
$OpenBSD: patch-src_Core_OldSchoolPropertyListWriting_m,v 1.1 2011/01/15 10:13:23 sebastia Exp $
|
||||
|
||||
missing header
|
||||
|
||||
--- src/Core/OldSchoolPropertyListWriting.m.orig Fri Jan 14 13:01:11 2011
|
||||
+++ src/Core/OldSchoolPropertyListWriting.m Fri Jan 14 13:01:26 2011
|
||||
@@ -19,6 +19,9 @@
|
||||
*/
|
||||
|
||||
#import "OldSchoolPropertyListWriting.h"
|
||||
+
|
||||
+#include <assert.h>
|
||||
+
|
||||
|
||||
|
||||
static BOOL IsFloatingPoint(NSNumber *number);
|
||||
16
games/oolite/patches/patch-src_SDL_OOSDLSoundMixer_m
Normal file
16
games/oolite/patches/patch-src_SDL_OOSDLSoundMixer_m
Normal file
@ -0,0 +1,16 @@
|
||||
$OpenBSD: patch-src_SDL_OOSDLSoundMixer_m,v 1.1 2011/01/15 10:13:23 sebastia Exp $
|
||||
|
||||
missing header
|
||||
|
||||
--- src/SDL/OOSDLSoundMixer.m.orig Fri Jan 14 13:02:04 2011
|
||||
+++ src/SDL/OOSDLSoundMixer.m Fri Jan 14 13:02:16 2011
|
||||
@@ -48,6 +48,9 @@ SOFTWARE.
|
||||
|
||||
#import "OOCocoa.h"
|
||||
#import "OOSDLSoundInternal.h"
|
||||
+
|
||||
+#include <assert.h>
|
||||
+
|
||||
|
||||
|
||||
static OOSoundMixer *sSingleton = nil;
|
||||
@ -1,5 +1,5 @@
|
||||
If you experience poor game performance, you can try adding the
|
||||
following lines to ~/GNUstep/Defaults/.GNUstepDefaults:
|
||||
"max-texture-size" = 64;
|
||||
"texture-anisotropy-scale" = 0;
|
||||
"use-texture-lod-bias" = NO;
|
||||
following to the configuration using the gnustep defaults tool:
|
||||
$ defaults write oolite max-texture-size 64
|
||||
$ defaults write oolite texture-anisotropy-scale 0
|
||||
$ defaults write oolite use-texture-lod-bias NO
|
||||
|
||||
Loading…
Reference in New Issue
Block a user