diff --git a/.gitignore b/.gitignore index ee9ca57e..164fa572 100644 --- a/.gitignore +++ b/.gitignore @@ -38,6 +38,10 @@ gradlew.bat build/ espeak.iml +# emscripten output: +a.out +a.out.js + # autotools AUTHORS diff --git a/emscripten/Makefile b/emscripten/Makefile index 0f70489d..7d93d9a8 100644 --- a/emscripten/Makefile +++ b/emscripten/Makefile @@ -1,6 +1,6 @@ # -# Copyright (C) 2014-2016 Eitan Isaacson -# Copyright (C) 2016 Alberto Pettarin +# Copyright (C) 2014-2017 Eitan Isaacson +# Copyright (C) 2016-2017 Alberto Pettarin # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -73,7 +73,7 @@ EM_WORKER_DATA=js/espeakng.worker.data EM_WORKER_JS=js/espeakng.worker.js EM_PTHREAD_MAIN_JS=js/pthread-main.js -# NOTE: intermediate objects +# NOTE: intermediate objects EM_OBJS=$(EM_GLUE_OBJ) $(EM_LIBESPEAKNG_SO) EM_ALL_PRE_JS=$(EM_PRE_JS) $(EM_ESPEAKNG_DATA_PACKAGE_JS) EM_ALL_POST_JS=$(EM_GLUE_AUTOGEN_JS) $(EM_POST_JS) @@ -82,8 +82,8 @@ EM_ALL_POST_JS=$(EM_GLUE_AUTOGEN_JS) $(EM_POST_JS) # # ./emconfigure ./configure --prefix=/usr --without-async # ./emmake make -CXXFLAGS+=-DESPEAK_DATA_PATH=\"$(EM_VIRTUAL_PATH_ESPEAKNG_DATA)\" -CXXFLAGS+=-I ./ -I ../ -I ../src/include/espeak-ng +CXXFLAGS+=-DESPEAK_DATA_PATH=\"$(EM_VIRTUAL_PATH_ESPEAKNG_DATA)\" +CXXFLAGS+=-I ./ -I ../ -I ../src/include/espeak-ng # NOTE: so far, pthread is not supported in any browser # except Firefox Nightly. @@ -114,7 +114,7 @@ $(EM_WORKER_DATA): $(EM_ESPEAKNG_DATA_PACKAGE_JS): $(EM_WORKER_DATA) $(EM_GLUE_AUTOGEN_CPP): $(EM_GLUE_IDL) - $(EM_WEBIDL_BINDER) $(EM_GLUE_IDL) $(EM_GLUE_PREFIX) + $(EM_WEBIDL_BINDER) $(EM_GLUE_IDL) $(EM_GLUE_PREFIX) $(EM_GLUE_AUTOGEN_JS): $(EM_GLUE_AUTOGEN_CPP) diff --git a/emscripten/README.md b/emscripten/README.md index d22992d4..b8eed3e1 100644 --- a/emscripten/README.md +++ b/emscripten/README.md @@ -7,10 +7,10 @@ to Javascript via allows client-side text-to-speech synthesis in any browser supporting Web workers and the Web Audio API. -* Version: 1.49.0 -* Date: 2016-11-01 +* Version: 1.49.1 +* Date: 2017-02-01 * License: the GNU General Public License, Version 3 (GPLv3) -* Size: 3.0 MB (including all the voices) +* Size: 3.2 MB (including all the voices) ## Demo diff --git a/emscripten/demo.html b/emscripten/demo.html index 3125eba9..33d5dc6b 100644 --- a/emscripten/demo.html +++ b/emscripten/demo.html @@ -3,7 +3,7 @@
-