Commit Graph
388 Commits
Author SHA1 Message Date
Reece Dunn dcbb5be63b Merge branch 'development' 2012-04-16 20:33:31 +01:00
Reece Dunn d485152451 Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
	dictsource/ta_rules
	phsource/compile_report
2012-04-16 20:32:22 +01:00
jonsd 9c3a48996e [1.46.16]
Fix phoneme translation for mbrola French voices.


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@281 d46cf337-b52f-0410-862d-fd96e6ae7743
2012-04-12 09:31:39 +00:00
jonsd 4d64bf10a1 [1.46.15]
git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@280 d46cf337-b52f-0410-862d-fd96e6ae7743
2012-04-12 00:12:09 +00:00
Reece Dunn 32dd1fa59b Makefile: support INCDIR and LIBDIR at the top level 2012-04-08 11:29:58 +01:00
Reece Dunn 9c59628485 Merge branch 'development'
Conflicts:
	docs/speak_lib.h
2012-04-08 09:45:27 +01:00
Reece Dunn bc2f90455f 1.46.15 2012-04-08 09:44:25 +01:00
Reece Dunn 7b2acbcf98 Merge branch 'development'
Conflicts:
	.gitignore
2012-02-22 19:08:22 +00:00
Reece Dunn 662e161d13 1.46.14 2012-02-22 19:07:04 +00:00
Reece Dunn 8f32b1369f Merge branch 'development' 2012-01-15 10:01:32 +00:00
Reece Dunn 17be838b1a 1.46.13 2012-01-15 09:59:53 +00:00
Reece Dunn 24b6d1c91a make: copy src/speak_lib.h to docs/speak_lib.h
The version of speak_lib.h in docs is out-of-sync with the version
in src. To keep the file layout the same as upstream espeak, but
to keep the files in sync, the docs/speak_lib.h file is copied as
part of the build via a make target.
2012-01-12 07:48:08 +00:00
Reece Dunn 674772f59b Merge branch 'development' 2012-01-06 18:37:29 +00:00
Reece Dunn c43dddfeeb Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
2012-01-06 18:37:07 +00:00
jonsd 5513c61919 [1.46.02] release version
git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@279 d46cf337-b52f-0410-862d-fd96e6ae7743
2012-01-06 17:39:50 +00:00
Reece Dunn ef261d3570 Merge branch 'development' 2011-12-31 15:57:16 +00:00
Reece Dunn 812bd35f73 1.46.11 2011-12-31 15:56:27 +00:00
Reece Dunn f689cbd31b Merge branch 'development' 2011-12-27 10:54:04 +00:00
Reece Dunn 4e0dccc4b9 Remove the phsource/error_intonation file (build output). 2011-12-27 10:53:39 +00:00
Reece Dunn 2702601049 Makefile: add dependencies on the source files for the top-level executable files. 2011-12-27 00:54:57 +00:00
Reece Dunn 9366efe43b Makefile: fix dependencies for the espeak-data directory to avoid unnecessary rebuilds. 2011-12-27 00:35:45 +00:00
Reece Dunn d45d73d56a Merge branch 'development'
Conflicts:
	.gitignore
2011-12-26 20:27:19 +00:00
Reece Dunn 16ca03220a remove files generated by 'espeakedit --compile' 2011-12-26 20:26:21 +00:00
Reece Dunn 550e3fb2e8 Makefile: shadow the phsource and dictsource directories instead of copying them 2011-12-26 20:19:25 +00:00
Reece Dunn 0644df4e0d Makefile: reference the binary files directly in the top-level makefile. 2011-12-26 16:11:45 +00:00
Reece Dunn 51fa765c3f Makefile: add language alias rules for the espeak-data/*_dict files 2011-12-26 12:24:53 +00:00
Reece Dunn 85fb91e498 Makefile: add rules for compiling the language dictionaries 2011-12-26 12:21:21 +00:00
Reece Dunn 1d38b69010 Revert "sort dict_phonemes as language compilation requires this"
This reverts commit 9e5227fb77.

This change breaks more than it fixes.
2011-12-26 09:54:01 +00:00
Reece Dunn 9e5227fb77 sort dict_phonemes as language compilation requires this 2011-12-26 09:22:00 +00:00
Reece Dunn 1439806564 makefile: fix dependencies on the root makefile to ensure all components are built 2011-12-24 11:25:39 +00:00
Reece Dunn 11ffc619fb Makefile: fix building espeakedit. 2011-12-23 10:09:10 +00:00
Mesar Hameed 5ab781f5e5 Top Makefile: changes to reflect that src/Makefile.espeakedit has been removed. 2011-12-23 00:24:37 +00:00
Mesar Hameed 296b5abeef Merge src/Makefile.espeakedit into src/Makefile.
benefits:
  Espeakedit now honors the specified USE_AUDIO flag.
  Remove duplication.
2011-12-23 00:22:06 +00:00
Reece Dunn f04e0dccd3 Makefile: fix building espeak 2011-12-22 16:22:53 +00:00
Reece Dunn fd05deb955 Merge branch 'development' 2011-12-22 11:45:43 +00:00
Reece Dunn 7510450b25 Merge branch 'upstream' into development 2011-12-22 11:44:06 +00:00
Reece Dunn 8947521074 Merge pull request #1 from mhameed/build
Build
2011-12-22 02:19:02 -08:00
Mesar Hameed deda2b6488 Makefile: rearrange vars, so that they are near their rules. 2011-12-22 03:12:37 +00:00
Mesar Hameed 0ec25289a0 Makefile: pull out common cppflags, sort filenames alphabetically. 2011-12-22 03:11:10 +00:00
Mesar Hameed d0346e8456 Makefile: remove redundant variables, rename others for clarity. 2011-12-21 22:27:53 +00:00
Mesar Hameed e4a0ae70f3 Makefile: pull out common files into a variable.
Makes it easier to see where speak_SOURCES and libspeak_SOURCES differ.
2011-12-21 21:23:06 +00:00
jonsd 5ac192df81 [1.46.10]
Add --version command-line option.

Allow hexadecimal numbers for UTF-8 bytes in rules in *_rules files.

wave_pulse.cpp, ensure wave_close is not called again while waiting.


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@278 d46cf337-b52f-0410-862d-fd96e6ae7743
2011-12-21 15:43:20 +00:00
Reece Dunn ea858d2b28 Merge branch 'development' into build 2011-12-17 08:14:39 +00:00
Reece Dunn 5c06650486 1.46.09 2011-12-17 08:13:34 +00:00
Reece Dunn 14e2ea6ffb Merge branch 'development' into build 2011-12-05 08:34:48 +00:00
Reece Dunn 5cd9f9217e remove a file added by mistake 2011-12-02 08:19:46 +00:00
Reece Dunn 37e60b00b6 Merge branch 'development' into build 2011-11-29 23:33:43 +00:00
Reece Dunn 1d07e97816 1.46.06 2011-11-29 23:31:13 +00:00
Reece Dunn 0dfb6627df Merge branch 'master' into development
Conflicts:
	dictsource/am_list
	phsource/ufric/s_pal.wav
2011-11-29 23:21:17 +00:00
jonsd 0617cc4750 [1.46.01]
Improve error detection in *_list files.

Lang=hu, remove feature to unstress the second of two capitalized words at end of clause.


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@277 d46cf337-b52f-0410-862d-fd96e6ae7743
2011-11-29 18:26:56 +00:00