Browse Source

Fix building 'my' (Burmese) on Windows.

master
Reece H. Dunn 9 years ago
parent
commit
565548fffe
3 changed files with 14 additions and 3 deletions
  1. 1
    1
      src/libespeak-ng/dictionary.c
  2. 1
    1
      src/windows/data.vcxproj
  3. 12
    1
      src/windows/installer/Product.wxs

+ 1
- 1
src/libespeak-ng/dictionary.c View File

@@ -310,7 +310,7 @@ const char *EncodePhonemes(const char *p, char *outptr, int *bad_phoneme)
*bad_phoneme = 0;

// skip initial blanks
while (isspace(*p))
while ((uint8_t)*p < 0x80 && isspace(*p))
p++;

while (((c = *p) != 0) && !isspace(c)) {

+ 1
- 1
src/windows/data.vcxproj View File

@@ -308,5 +308,5 @@
<Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=zhy"/>
</Target>
<!-- NOTE: Compiling 'my' triggers an assertion, so is disabled for now. -->
<Target Name="Dictionaries" DependsOnTargets="af;am;an;as;az;bg;bn;ca;cs;cy;da;de;el;en;eo;es;et;eu;fa;fi;fr;ga;gd;grc;gu;hbs;hi;hu;hy;ia;id;is;it;jbo;ka;kl;kn;ko;ku;la;lfn;lt;lv;mk;ml;mr;ms;mt;nci;ne;nl;no;om;or;pa;pap;pl;pt;ro;ru;si;sk;sl;sq;sv;sw;ta;te;tn;tr;tt;ur;vi;zh;zhy"/>
<Target Name="Dictionaries" DependsOnTargets="af;am;an;as;az;bg;bn;ca;cs;cy;da;de;el;en;eo;es;et;eu;fa;fi;fr;ga;gd;grc;gu;hbs;hi;hu;hy;ia;id;is;it;jbo;ka;kl;kn;ko;ku;la;lfn;lt;lv;mk;ml;mr;ms;mt;my;nci;ne;nl;no;om;or;pa;pap;pl;pt;ro;ru;si;sk;sl;sq;sv;sw;ta;te;tn;tr;tt;ur;vi;zh;zhy"/>
</Project>

+ 12
- 1
src/windows/installer/Product.wxs View File

@@ -31,6 +31,7 @@
<ComponentGroupRef Id="LangBengali"/>
<ComponentGroupRef Id="LangBosnian"/>
<ComponentGroupRef Id="LangBulgarian"/>
<ComponentGroupRef Id="LangBurmese"/>
<ComponentGroupRef Id="LangCatalan"/>
<ComponentGroupRef Id="LangChineseCantonese"/>
<ComponentGroupRef Id="LangChineseMandarin"/>
@@ -284,6 +285,9 @@
<Component Id="mt_dict" Win64="$(var.Win64)" Guid="5FE13F53-1532-46FD-BD77-EFFEDEFF0EEB">
<File Name="mt_dict" Source="$(var.ProjectDir)..\..\..\espeak-data\mt_dict" KeyPath="yes"/>
</Component>
<Component Id="my_dict" Win64="$(var.Win64)" Guid="2C066949-D649-4A1C-AFBF-C8642547F075">
<File Name="my_dict" Source="$(var.ProjectDir)..\..\..\espeak-data\my_dict" KeyPath="yes"/>
</Component>
<Component Id="nci_dict" Win64="$(var.Win64)" Guid="992FEB10-C20E-4981-A348-818DB186B5DF">
<File Name="nci_dict" Source="$(var.ProjectDir)..\..\..\espeak-data\nci_dict" KeyPath="yes"/>
</Component>
@@ -623,6 +627,9 @@
<Component Id="cmn" Win64="$(var.Win64)" Guid="B9F21B2A-BD29-42DF-84D6-AD1CA29799B5">
<File Name="cmn" Source="$(var.ProjectDir)..\..\..\espeak-data\voices\sit\cmn" KeyPath="yes"/>
</Component>
<Component Id="my" Win64="$(var.Win64)" Guid="0927A4D6-4DA1-431C-ABFA-E9871165B3EC">
<File Name="my" Source="$(var.ProjectDir)..\..\..\espeak-data\voices\sit\my" KeyPath="yes"/>
</Component>
<Component Id="yue" Win64="$(var.Win64)" Guid="C08D04D1-B17B-40CA-B6B6-3C78F1D4E94A">
<File Name="yue" Source="$(var.ProjectDir)..\..\..\espeak-data\voices\sit\yue" KeyPath="yes"/>
</Component>
@@ -758,6 +765,10 @@
<ComponentRef Id="bg"/>
<ComponentRef Id="bg_dict"/>
</ComponentGroup>
<ComponentGroup Id="LangBurmese">
<ComponentRef Id="my"/>
<ComponentRef Id="my_dict"/>
</ComponentGroup>
<ComponentGroup Id="LangCatalan">
<ComponentRef Id="ca"/>
<ComponentRef Id="ca_dict"/>
@@ -1079,4 +1090,4 @@
<ComponentRef Id="cy_dict"/>
</ComponentGroup>
</Fragment>
</Wix>
</Wix>

Loading…
Cancel
Save