Merge branch 'master' into android

This commit is contained in:
Reece H. Dunn
2013-10-14 09:22:45 +01:00
3 changed files with 10 additions and 1 deletions
+7
View File
@@ -226,6 +226,7 @@ dictionaries: src/espeak \
espeak-data/ga_dict \
espeak-data/grc_dict \
espeak-data/gu_dict \
espeak-data/hbs_dict \
espeak-data/hi_dict \
espeak-data/hu_dict \
espeak-data/hy_dict \
@@ -407,6 +408,12 @@ dictsource/gu_extra:
espeak-data/gu_dict: src/espeak espeak-data/phontab dictsource/gu_list dictsource/gu_rules dictsource/gu_extra
cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=gu && cd ..
hbs: espeak-data/hbs_dict
dictsource/hbs_extra:
touch dictsource/hbs_extra
espeak-data/hbs_dict: src/espeak espeak-data/phontab dictsource/hbs_list dictsource/hbs_rules dictsource/hbs_extra
cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=hbs && cd ..
hi: espeak-data/hi_dict
dictsource/hi_extra:
touch dictsource/hi_extra
+1 -1
View File
@@ -3,7 +3,7 @@
mkdir -p m4
touch AUTHORS
touch NEWS
ln -sv README.md README
ln -svf README.md README
if [ -d .git ] ; then
git submodule update --init --recursive || exit 1
+2
View File
@@ -13,6 +13,8 @@ dictionaries = {}
# Map voice names to dictionaries when these do not match.
special_voices = {
'bs': 'hbs',
'hr': 'hbs',
'zh-yue': 'zhy',
}