Author: fast Date: 2016-02-02 09:53:23 -0800 (Tue, 02 Feb 2016) New Revision: 352 - (https://trac.ict.usc.edu/vh_public/changeset/352) Log: festival - merging changes from VH repository r14713, r14732, r15427, r15428, r15433
r14713 festival - fixed bug with header guard r14732 festival - fixed bug with header guard r15427 festival - code changes required for VS2015. t2s.h - renamed prototype for terminate() since it conflicts with function in crt. I don't think there's an actual implementation of this function, so I don't think it's significant. EST_defines_win32.h - commented out stub for isnan() on VS2015 and higher. sig2fv_main - fixed some errors in constructing the usage text. r15428 festival - added festival libraries compiled for VS2015. compiled by me. Same steps as in r11283 .bat file I use in \lib\festival: @setlocal call "%VS140COMNTOOLS%\..\..\VC\vcvarsall.bat" x86 echo on pushd speech_tools nmake /FVCMakefile popd pushd festival nmake /FVCMakefile popd @endlocal ------ r11283 - from visual studio 2008 x86 prompt: nmake /FVCMakefile in both \speech_tools and \festival.exe then move *.lib and *.exe to \lib9 and \main9 and \testsuite9 folders - from visual studio 2010 x86 prompt: nmake /FVCMakefile in both \speech_tools and \festival.exe Note: Make sure you *remove* *.lib and *.exe and *.obj from all folder before beginning each step. The .lib's are generated by appending the data, so you will get corrupt .libs if you don't remove them first. r15433 festival - removed VS2008 and older projects and libraries. no longer needed. Removed: trunk/lib/festival/festival/src/lib9/ trunk/lib/festival/festival/src/main9/ trunk/lib/festival/speech_tools/lib9/ trunk/lib/festival/speech_tools/main9/ trunk/lib/festival/speech_tools/testsuite9/ Modified: trunk/lib/festival/festival/src/lib/libFestival.lib trunk/lib/festival/festival/src/main/festival.exe trunk/lib/festival/festival/src/main/festival_client.exe trunk/lib/festival/festival/src/modules/donovan/t2s.h trunk/lib/festival/speech_tools/include/EST_stats.h trunk/lib/festival/speech_tools/include/win32/EST_defines_win32.h trunk/lib/festival/speech_tools/lib/libestbase.lib trunk/lib/festival/speech_tools/lib/libestools.lib trunk/lib/festival/speech_tools/lib/libeststring.lib trunk/lib/festival/speech_tools/main/align.exe trunk/lib/festival/speech_tools/main/bcat.exe trunk/lib/festival/speech_tools/main/ch_lab.exe trunk/lib/festival/speech_tools/main/ch_track.exe trunk/lib/festival/speech_tools/main/ch_utt.exe trunk/lib/festival/speech_tools/main/ch_wave.exe trunk/lib/festival/speech_tools/main/design_filter.exe trunk/lib/festival/speech_tools/main/dp.exe trunk/lib/festival/speech_tools/main/fringe_client.exe trunk/lib/festival/speech_tools/main/na_play.exe trunk/lib/festival/speech_tools/main/na_record.exe trunk/lib/festival/speech_tools/main/ngram_build.exe trunk/lib/festival/speech_tools/main/ngram_test.exe trunk/lib/festival/speech_tools/main/ols.exe trunk/lib/festival/speech_tools/main/ols_test.exe trunk/lib/festival/speech_tools/main/pda.exe trunk/lib/festival/speech_tools/main/pitchmark.exe trunk/lib/festival/speech_tools/main/scfg_make.exe trunk/lib/festival/speech_tools/main/scfg_parse.exe trunk/lib/festival/speech_tools/main/scfg_test.exe trunk/lib/festival/speech_tools/main/scfg_train.exe trunk/lib/festival/speech_tools/main/sig2fv.exe trunk/lib/festival/speech_tools/main/sig2fv_main.cc trunk/lib/festival/speech_tools/main/sigfilter.exe trunk/lib/festival/speech_tools/main/siod.exe trunk/lib/festival/speech_tools/main/spectgen.exe trunk/lib/festival/speech_tools/main/tilt_analysis.exe trunk/lib/festival/speech_tools/main/tilt_synthesis.exe trunk/lib/festival/speech_tools/main/viterbi.exe trunk/lib/festival/speech_tools/main/wagon.exe trunk/lib/festival/speech_tools/main/wagon_test.exe trunk/lib/festival/speech_tools/main/wfst_build.exe trunk/lib/festival/speech_tools/main/wfst_run.exe trunk/lib/festival/speech_tools/main/wfst_train.exe trunk/lib/festival/speech_tools/main/xml_parser.exe trunk/lib/festival/speech_tools/testsuite/complex_example.exe trunk/lib/festival/speech_tools/testsuite/complex_regression.exe trunk/lib/festival/speech_tools/testsuite/deq_example.exe trunk/lib/festival/speech_tools/testsuite/deq_regression.exe trunk/lib/festival/speech_tools/testsuite/feature_example.exe trunk/lib/festival/speech_tools/testsuite/feature_regression.exe trunk/lib/festival/speech_tools/testsuite/handle_example.exe trunk/lib/festival/speech_tools/testsuite/handle_regression.exe trunk/lib/festival/speech_tools/testsuite/hash_example.exe trunk/lib/festival/speech_tools/testsuite/hash_regression.exe trunk/lib/festival/speech_tools/testsuite/kvl_example.exe trunk/lib/festival/speech_tools/testsuite/kvl_regression.exe trunk/lib/festival/speech_tools/testsuite/ling_example.exe trunk/lib/festival/speech_tools/testsuite/ling_regression.exe trunk/lib/festival/speech_tools/testsuite/list_example.exe trunk/lib/festival/speech_tools/testsuite/list_regression.exe trunk/lib/festival/speech_tools/testsuite/named_enum_example.exe trunk/lib/festival/speech_tools/testsuite/named_enum_regression.exe trunk/lib/festival/speech_tools/testsuite/pathname_example.exe trunk/lib/festival/speech_tools/testsuite/pathname_regression.exe trunk/lib/festival/speech_tools/testsuite/string_example.exe trunk/lib/festival/speech_tools/testsuite/string_regression.exe trunk/lib/festival/speech_tools/testsuite/token_example.exe trunk/lib/festival/speech_tools/testsuite/token_regression.exe trunk/lib/festival/speech_tools/testsuite/track_example.exe trunk/lib/festival/speech_tools/testsuite/track_regression.exe trunk/lib/festival/speech_tools/testsuite/xml_example.exe trunk/lib/festival/speech_tools/testsuite/xml_regression.exe ------------------------------------------------------------------------------ Site24x7 APM Insight: Get Deep Visibility into Application Performance APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month Monitor end-to-end web transactions and take corrective actions now Troubleshoot faster and improve end-user experience. Signup Now! http://pubads.g.doubleclick.net/gampad/clk?id=267308311&iu=/4140 _______________________________________________ Smartbody-svn mailing list Smartbody-svn@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/smartbody-svn
