Added eSpeak support for the Windows builds. Moved espeak-data folder to cross platform dependencies. Updated default.apspec files with new location of espeak-data.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3268 127b21dd-08f5-0310-b4b7-95ae10353056master
parent
69deda0865
commit
39bf0354e5
|
@ -20,6 +20,7 @@ after-all::
|
|||
$(MKDIRS) $(PROGDIR)/Resources
|
||||
$(CP) -r -u -f Resources $(PROGDIR)
|
||||
$(CP) -r -u -f Schemata $(PROGDIR)/Resources
|
||||
$(CP) -r -u -f deps/Cross-platform-deps/espeak-data $(PROGDIR)/Resources
|
||||
$(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)
|
||||
|
|
8
Makefile
8
Makefile
|
@ -19,11 +19,13 @@ 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
|
||||
HAS_ESPEAK=libespeak=no # No eSpeak for Windows yet
|
||||
else
|
||||
HAS_ESPEAK=libespeak=yes # Build with eSpeak for non-Windows
|
||||
endif
|
||||
|
||||
ifeq ($(GNUSTEP_HOST_OS),linux-gnu)
|
||||
|
|
|
@ -50,12 +50,12 @@ tar zcf $build_root/oolite.app.tar oolite.app --exclude .svn
|
|||
|
||||
cd deps/Cross-platform-deps/
|
||||
tar zcf $build_root/dtds.tar DTDs --exclude .svn
|
||||
tar zcf $build_root/espeak-data.tar espeak-data --exclude .svn
|
||||
cd ../Linux-deps/
|
||||
cp oolite.src $build_root
|
||||
cp oolite-update.src $build_root
|
||||
cp PLAYING.TXT $build_root
|
||||
cp README.TXT $build_root
|
||||
tar zcf $build_root/espeak-data.tar espeak-data --exclude .svn
|
||||
cd x86
|
||||
tar zcf $build_root/oolite.deps.tar lib --exclude .svn
|
||||
echo $SOFTWAREVERSION >$build_root/release.txt
|
||||
|
|
|
@ -50,12 +50,12 @@ tar zcf $build_root/oolite.app.tar oolite.app --exclude .svn
|
|||
|
||||
cd deps/Cross-platform-deps/
|
||||
tar zcf $build_root/dtds.tar DTDs --exclude .svn
|
||||
tar zcf $build_root/espeak-data.tar espeak-data --exclude .svn
|
||||
cd ../Linux-deps/
|
||||
cp oolite.src $build_root
|
||||
cp oolite-update.src $build_root
|
||||
cp PLAYING.TXT $build_root
|
||||
cp README.TXT $build_root
|
||||
tar zcf $build_root/espeak-data.tar espeak-data --exclude .svn
|
||||
cd x86_64
|
||||
tar zcf $build_root/oolite.deps.tar lib --exclude .svn
|
||||
echo $SOFTWAREVERSION >$build_root/release.txt
|
||||
|
|
Loading…
Reference in New Issue