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

Removal of old JavaScript from the Windows port. 

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4200 127b21dd-08f5-0310-b4b7-95ae10353056
master
Nikos Barkas 2011-01-30 18:58:14 +00:00
parent 747fb4ae53
commit 62579128ca
3 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
GNUmakefile
View File

@ -49,9 +49,6 @@ ifeq ($(GNUSTEP_HOST_OS),mingw32)
ADDITIONAL_OBJCFLAGS+=-DHAVE_LIBESPEAK=1
GNUSTEP_OBJ_DIR_NAME := $(GNUSTEP_OBJ_DIR_NAME).spk
endif
ifeq ($(JS_ECMAv5),yes)
ADDITIONAL_OBJCFLAGS+=-DOO_NEW_JS=1
endif
else
ifeq ($(JS_ECMAv5),yes)
LIBJS_SRC_DIR_COMMON = deps/Linux-deps/JS32ECMAv5/include

12
GNUmakefile.postamble
View File

@ -30,17 +30,11 @@ ifeq ($(debug),no)
endif
ifeq ($(GNUSTEP_HOST_OS),mingw32)
$(CP) -r -u -f deps/Windows-x86-deps/DLLs/*.dll $(PROGDIR)
ifeq ($(JS_ECMAv5),yes)
ifeq ($(debug),yes)
rm $(PROGDIR)/js32ECMAv5.dll
else
rm $(PROGDIR)/js32ECMAv5dbg.dll
endif
rm $(PROGDIR)/js32.dll
ifeq ($(debug),yes)
rm $(PROGDIR)/js32ECMAv5.dll
else
rm $(PROGDIR)/js32ECMAv5dbg.dll
rm $(PROGDIR)/js32ECMAv5.dll
endif
endif
endif
after-clean::

2
Makefile
View File

@ -26,7 +26,7 @@ pkg-debsnapshot: DEB_REV := $(shell echo "0~trunk${DEB_REV}")
LIBJS_SRC_DIR=deps/Cross-platform-deps/SpiderMonkey/js/src
ifeq ($(GNUSTEP_HOST_OS),mingw32)
LIBJS=deps/Windows-x86-deps/DLLs/js32.dll
LIBJS=deps/Windows-x86-deps/DLLs/js32ECMAv5.dll
endif
ifeq ($(GNUSTEP_HOST_OS),linux-gnu)