shithub: flite

Info  •  Files  •  Log  •  Branches

bugfix: voice builds broken for non-grapheme voices

Flite builds for non-grapheme voices were referring to an undefined variable,
breaking the builds.  This commit uses build flags to only enable the extern
declaration for grapheme based clustergen voices.

--- a/tools/Makefile.flite

+++ b/tools/Makefile.flite

@@ -69,6 +69,7 @@

 endif

 ifeq ($(CG_GRAPHEME),true)

 CSRCS += $(VOICENAME)_phoneset.c 

+EXTRA_CC_FLAGS += -DCG_GRAPHEME=1

 endif

 MCEPOBJS =

 LPCOBJS =

--- a/tools/VOICE_cg.c

+++ b/tools/VOICE_cg.c

@@ -48,7 +48,9 @@

 extern cst_cg_db __VOICENAME___cg_db;

 cst_voice *__VOICENAME___cg = NULL;

+#ifdef CG_GRAPHEME

 extern const cst_phoneset __VOICENAME___phoneset;

+#endif

 cst_voice *register___VOICENAME__(const char *voxdir)

 {

@@ -75,11 +77,13 @@

     flite_feat_set(vox->features,"lexicon",lexicon_val(lex));

     flite_feat_set(vox->features,"postlex_func",uttfunc_val(lex->postlex));

+#ifdef CG_GRAPHEME

     /* If grapheme link in grapheme specific info */

     if (feat_present(vox->features,"grapheme"))

     {

         flite_feat_set(vox->features,"phoneset",phoneset_val(&__VOICENAME___phoneset));

     }

+#endif

     /* No standard segment durations are needed as its done at the */

     /* HMM state level */