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

Detach Linux builds from using /deps/Cross-platform-deps/SpiderMonkey source. 

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4179 127b21dd-08f5-0310-b4b7-95ae10353056
master
getafix 2011-01-29 18:17:47 +00:00
parent 42eb084069
commit 16077685a5
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
GNUmakefile
View File

@ -53,7 +53,7 @@ ifeq ($(GNUSTEP_HOST_OS),mingw32)
ADDITIONAL_OBJCFLAGS+=-DOO_NEW_JS=1
endif
else
ifeq ($(use_newjs),yes)
ifeq ($(JS_ECMAv5),yes)
LIBJS_SRC_DIR = deps/Linux-deps/JS32ECMAv5/$(HOST_ARCH)/include
LIBJS_BIN_DIR = deps/Linux-deps/JS32ECMAv5/$(HOST_ARCH)/lib/
ifeq ($(debug),no)
@ -94,7 +94,7 @@ else
endif
endif
ifeq ($(use_newjs),yes)
ifeq ($(JS_ECMAv5),yes)
ADDITIONAL_OBJCFLAGS+=-DOO_NEW_JS=1
endif
endif

7
Makefile
View File

@ -85,7 +85,7 @@ deps-release-deployment: $(DEPS)
.PHONY: deps-release-snapshot
deps-release-snapshot: $(DEPS)
make -f GNUmakefile SNAPSHOT_BUILD=yes VERSION_STRING=$(VER) debug=no use_deps=yes use_newjs=yes
make -f GNUmakefile SNAPSHOT_BUILD=yes VERSION_STRING=$(VER) debug=no use_deps=yes
$(LIBJS):
ifeq ($(GNUSTEP_HOST_OS),mingw32)
@ -93,8 +93,9 @@ 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 $(LIBJS_BUILD_FLAGS)
# When Linux is ready to compile the Javascript engine from source
# then re-activate the following line of code and update it appropriately
# make -C $(LIBJS_SRC_DIR) -f Makefile.ref $(LIBJS_BUILD_FLAGS)
.PHONY: clean
clean: