8ac5e1dd55
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@
18 lines
1.3 KiB
Plaintext
18 lines
1.3 KiB
Plaintext
$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
|
|
+ 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`
|
|
+ ADDITIONAL_OBJCFLAGS = -std=c99 -DLOADSAVEGUI -DLINUX -DXP_UNIX -Wno-import -DBUNDLE_PATH='@"$(LOCALBASE)/share/oolite"' `sdl-config --cflags`
|
|
oolite_LIB_DIRS += -L/usr/X11R6/lib/
|
|
endif
|
|
ifeq ($(libespeak),yes)
|