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

+ Add JS_OPT=yes/no command-line parameter to (GNU)Makefile. Determines whether to compile/link with Optimised or Debug version of Spidermonkey. (Default optimised) 

+ Disable NSOperation for GNUstep builds for now.  Current GNUstep (up to trunk) only has an incomplete implementation of it.



git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3478 127b21dd-08f5-0310-b4b7-95ae10353056
master
Michael Werle 2010-06-06 22:05:16 +00:00
parent cde179ca8e
commit 01322db4ee
3 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
GNUmakefile
View File

@ -37,7 +37,11 @@ ifeq ($(GNUSTEP_HOST_OS),mingw32)
endif
else
LIBJS_SRC_DIR = deps/Cross-platform-deps/SpiderMonkey/js/src
LIBJS_BIN_DIR = $(LIBJS_SRC_DIR)/Linux_All_OPT.OBJ
ifeq ($(JS_OPT),no)
LIBJS_BIN_DIR=$(LIBJS_SRC_DIR)/Linux_All_DBG.OBJ
else
LIBJS_BIN_DIR=$(LIBJS_SRC_DIR)/Linux_All_OPT.OBJ
endif
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_OBJC_LIBS = $(LIBJS_BIN_DIR)/libjs.a -lGLU -lGL
ADDITIONAL_CFLAGS = -Wall -DLINUX -DNEED_STRLCPY `sdl-config --cflags`

20
Makefile
View File

@ -30,17 +30,16 @@ ifeq ($(GNUSTEP_HOST_OS),mingw32)
endif
ifeq ($(GNUSTEP_HOST_OS),linux-gnu)
# OBSOLETE - GNUstep environment should be setup in the environment/shell
# you use to build oolite and not hardcoded here.
#
# Set up GNU make environment
# GNUSTEP_MAKEFILES=/usr/share/GNUstep/Makefiles
#
# These are the paths for our custom-built Javascript library
LIBJS_INC_DIR=$(LIBJS_SRC_DIR)
LIBJS_BIN_DIR=$(LIBJS_SRC_DIR)/Linux_All_OPT.OBJ
LIBJS=$(LIBJS_BIN_DIR)/libjs.a
ifeq ($(JS_OPT),no)
LIBJS_BIN_DIR=$(LIBJS_SRC_DIR)/Linux_All_DBG.OBJ
LIBJS_BUILD_FLAGS=
else
LIBJS_BIN_DIR=$(LIBJS_SRC_DIR)/Linux_All_OPT.OBJ
LIBJS_BUILD_FLAGS=BUILD_OPT=1
endif
LIBJS=$(LIBJS_BIN_DIR)/libjs.a
endif
DEPS=$(LIBJS)
@ -94,7 +93,8 @@ ifeq ($(GNUSTEP_HOST_OS),mingw32)
@echo " Please build it yourself and copy it to $(LIBJS)."
false
endif
make -C $(LIBJS_SRC_DIR) -f Makefile.ref BUILD_OPT=1
#make -C $(LIBJS_SRC_DIR) -f Makefile.ref BUILD_OPT=1
make -C $(LIBJS_SRC_DIR) -f Makefile.ref $(LIBJS_BUILD_FLAGS)
.PHONY: clean
clean:

6
src/Core/OONSOperation.h
View File

@ -10,7 +10,11 @@
#if OOLITE_MAC_OS_X
#define OO_HAVE_NSOPERATION OOLITE_LEOPARD
#elif OOLITE_GNUSTEP
#define OO_HAVE_NSOPERATION OOLITE_GNUSTEP_1_20 && OS_API_VERSION(100500, GS_API_LATEST)
// #define OO_HAVE_NSOPERATION OOLITE_GNUSTEP_1_20 && OS_API_VERSION(100500, GS_API_LATEST)
// GNUstep (even current trunk - 1.21 @ 2010.06.06) only contains an
// incomplete implementation of NSOperation. Namely, it's missing
// NSInvocationOperation which is used in OOAsyncWorkManager.m
#define OO_HAVE_NSOPERATION (0)
#endif
#endif