diff options
| author | Solomon Peachy <pizza@shaftnet.org> | 2020-07-21 00:34:37 -0400 |
|---|---|---|
| committer | Solomon Peachy <pizza@shaftnet.org> | 2020-07-21 11:59:47 +0000 |
| commit | 688c89cfe13658dc0c36c67235ed968e286d78bf (patch) | |
| tree | d365eac0ec1211483583c6c6b8b71c4d36ab4469 /apps/lang | |
| parent | 25f9601d7bd6f98110e646d7d2b769d26b46bfca (diff) | |
| download | rockbox-688c89cfe13658dc0c36c67235ed968e286d78bf.tar.gz rockbox-688c89cfe13658dc0c36c67235ed968e286d78bf.zip | |
genlang: More voice-related fixes.
* Use consistent ID numbering
* Use consistent logic for voicelist and voicebin files
* Fix situations where English <-> English would fail in strange ways
* Delete leftover tmpfile.
* Off-by-one error in voice validation code
* Off-by-one error in voicelist generation
Change-Id: Ib3cea2c6612138b1cbe614dacbe51000199cc9ad
Diffstat (limited to 'apps/lang')
| -rw-r--r-- | apps/lang/lang.make | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/lang/lang.make b/apps/lang/lang.make index b705ff9d0d..08cec5090a 100644 --- a/apps/lang/lang.make +++ b/apps/lang/lang.make | |||
| @@ -51,7 +51,7 @@ $(BUILDDIR)/%.lng $(BUILDDIR)/%.vstrings: $(ROOTDIR)/%.lang $(BUILDDIR)/apps/gen | |||
| 51 | $(SILENT)mkdir -p $(dir $@) | 51 | $(SILENT)mkdir -p $(dir $@) |
| 52 | $(SILENT)$(TOOLSDIR)/genlang -u -e=$(APPSDIR)/lang/english.lang $< > $@.tmp | 52 | $(SILENT)$(TOOLSDIR)/genlang -u -e=$(APPSDIR)/lang/english.lang $< > $@.tmp |
| 53 | $(SILENT)$(TOOLSDIR)/genlang -e=$(APPSDIR)/lang/english.lang -t=$(MODELNAME):`cat $(BUILDDIR)/apps/genlang-features` -i=$(TARGET_ID) -b=$*.lng -c=$*.vstrings $@.tmp | 53 | $(SILENT)$(TOOLSDIR)/genlang -e=$(APPSDIR)/lang/english.lang -t=$(MODELNAME):`cat $(BUILDDIR)/apps/genlang-features` -i=$(TARGET_ID) -b=$*.lng -c=$*.vstrings $@.tmp |
| 54 | $(SILENT)rm -f $<.tmp | 54 | $(SILENT)rm -f $@.tmp |
| 55 | 55 | ||
| 56 | $(BUILDDIR)/apps/lang/voicestrings.zip: $(VOICEOBJ) | 56 | $(BUILDDIR)/apps/lang/voicestrings.zip: $(VOICEOBJ) |
| 57 | $(call PRINTS,ZIP $(subst $(BUILDDIR)/,,$@)) | 57 | $(call PRINTS,ZIP $(subst $(BUILDDIR)/,,$@)) |