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

Better espeak import library linker semantics. Removed now obsolete libespeak=yes setting from Makefile. espeak-data folder is copied in installation image under Windows only when building with eSpeak support. 

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3276 127b21dd-08f5-0310-b4b7-95ae10353056
master
Nikos Barkas 2010-05-03 07:11:56 +00:00
parent cac50efa67
commit 234834f712
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
GNUmakefile
View File

@ -47,7 +47,7 @@ else
endif
endif
ifeq ($(ESPEAK),yes)
ADDITIONAL_OBJC_LIBS += -lespeak
ADDITIONAL_OBJC_LIBS += -lespeak.dll
ADDITIONAL_OBJCFLAGS+=-DHAVE_LIBESPEAK=1
GNUSTEP_OBJ_DIR_NAME := $(GNUSTEP_OBJ_DIR_NAME).spk
endif

2
GNUmakefile.postamble
View File

@ -20,7 +20,9 @@ after-all::
$(MKDIRS) $(PROGDIR)/Resources
$(CP) -r -u -f Resources $(PROGDIR)
$(CP) -r -u -f Schemata $(PROGDIR)/Resources
ifeq ($(ESPEAK),yes)
$(CP) -r -u -f deps/Cross-platform-deps/espeak-data $(PROGDIR)/Resources
endif
$(CP) -u -f src/Cocoa/Info-Oolite.plist $(PROGDIR)/Resources/Info-gnustep.plist
$(CP) -u -f $(GNUSTEP_OBJ_DIR_NAME)/$(SRC_BIN) $(PROGDIR)/$(DEST_BIN)
ifeq ($(debug),no)

17
Makefile
View File

@ -19,11 +19,6 @@ pkg-debsnapshot: DEB_REV := $(shell echo "~svn${SVNREVISION}${DEB_REV}")
LIBJS_SRC_DIR=deps/Cross-platform-deps/SpiderMonkey/js/src
# We are building with eSpeak support on Windows and Linux. Change the line below
# to HAS_ESPEAK=libespeak=no to disable speech synthesis.
HAS_ESPEAK=libespeak=yes
ifeq ($(GNUSTEP_HOST_OS),mingw32)
LIBJS=deps/Windows-x86-deps/DLLs/js32.dll
endif
@ -56,27 +51,27 @@ endif
#
.PHONY: release
release: $(DEPS)
make -f GNUmakefile debug=no $(HAS_ESPEAK)
make -f GNUmakefile debug=no
.PHONY: distro-release
distro-release: $(DEPS)
make -f GNUmakefile use_distro_deps=yes debug=no $(HAS_ESPEAK)
make -f GNUmakefile use_distro_deps=yes debug=no
.PHONY: release-deployment
release-deployment: $(DEPS)
make -f GNUmakefile DEPLOYMENT_RELEASE_CONFIGURATION=yes debug=no $(HAS_ESPEAK)
make -f GNUmakefile DEPLOYMENT_RELEASE_CONFIGURATION=yes debug=no
.PHONY: release-snapshot
release-snapshot: $(DEPS)
make -f GNUmakefile SNAPSHOT_BUILD=yes VERSION_STRING=$(VER) debug=no $(HAS_ESPEAK)
make -f GNUmakefile SNAPSHOT_BUILD=yes VERSION_STRING=$(VER) debug=no
.PHONY: debug
debug: $(DEPS)
make -f GNUmakefile debug=yes $(HAS_ESPEAK)
make -f GNUmakefile debug=yes
.PHONY: distro-debug
distro-debug: $(DEPS)
make -f GNUmakefile use_distro_deps=yes debug=yes libespeak=yes
make -f GNUmakefile use_distro_deps=yes debug=yes
$(LIBJS):
ifeq ($(GNUSTEP_HOST_OS),mingw32)
@echo "ERROR - this Makefile can't (yet) build the Javascript DLL"