[Scummvm-git-logs] scummvm master -> 664dd4a8aab66452c997facb8bd547f307415330

[antoniou79]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
664dd4a8aa DEVTOOLS: module.mk fix for BR subtitles xls/xlsx support


Commit: 664dd4a8aab66452c997facb8bd547f307415330
    https://github.com/scummvm/scummvm/commit/664dd4a8aab66452c997facb8bd547f307415330
Author: Thanasis Antoniou (a.antoniou79 at gmail.com)
Date: 2019-03-09T20:10:19+02:00

Commit Message:
DEVTOOLS: module.mk fix for BR subtitles xls/xlsx support

bugfix: search with full path for .xls existence before trying the xlsx

Changed paths:
    devtools/create_bladerunner/subtitles/module.mk


diff --git a/devtools/create_bladerunner/subtitles/module.mk b/devtools/create_bladerunner/subtitles/module.mk
index acf8568..454d733 100644
--- a/devtools/create_bladerunner/subtitles/module.mk
+++ b/devtools/create_bladerunner/subtitles/module.mk
@@ -10,15 +10,18 @@ BLADERUNNER_SUBTITLES_SAMPLE_INPUT_FOLDER := $(srcdir)/devtools/create_bladerunn
 INTERMEDIATE_RESOURCE_FILES_UI := "OPTIONS.TRE" "DLGMENU.TRE" "SCORERS.TRE" "VK.TRE" "CLUES.TRE" "CRIMES.TRE" "ACTORS.TRE" "HELP.TRE" "AUTOSAVE.TRE" "ERRORMSG.TRE" "SPINDEST.TRE" "KIA.TRE" "KIACRED.TRE" "CLUETYPE.TRE" "ENDCRED.TRE" "POGO.TRE"
 INTERMEDIATE_RESOURCE_FILES_SUBS := "INGQUO_E.TRE" "WSTLGO_E.TRE" "BRLOGO_E.TRE" "INTRO_E.TRE" "MW_A_E.TRE" "MW_B01_E.TRE" "MW_B02_E.TRE" "MW_B03_E.TRE" "MW_B04_E.TRE" "MW_B05_E.TRE" "INTRGT_E.TRE" "MW_D_E.TRE" "MW_C01_E.TRE" "MW_C02_E.TRE" "MW_C03_E.TRE" "END04A_E.TRE" "END04B_E.TRE" "END04C_E.TRE" "END06_E.TRE" "END01A_E.TRE" "END01B_E.TRE" "END01C_E.TRE" "END01D_E.TRE" "END01E_E.TRE" "END01F_E.TRE" "END03_E.TRE"
 INPUT_TRANSCRIPT_FILENAME := englishTranscript.xls
-ifeq (,$(wildcard $(INPUT_TRANSCRIPT_FILENAME)))
-	INPUT_TRANSCRIPT_FILENAME := englishTranscript.xlsx
+INPUT_TRANSCRIPT_FILEPATH := $(BLADERUNNER_SUBTITLES_SAMPLE_INPUT_FOLDER)/$(INPUT_TRANSCRIPT_FILENAME)
+
+ifeq (,$(wildcard $(INPUT_TRANSCRIPT_FILEPATH)))
+INPUT_TRANSCRIPT_FILENAME := englishTranscript.xlsx
+INPUT_TRANSCRIPT_FILEPATH := $(BLADERUNNER_SUBTITLES_SAMPLE_INPUT_FOLDER)/$(INPUT_TRANSCRIPT_FILENAME) 
 endif
 
 INPUT_TRANSCRIPT_AUX_CONF_FILENAME := configureFontsTranslation.txt
 INPUT_FONT_GLYPHS_PNG_FILENAME := subtitlesFont.png
 INPUT_FONT_GLYPHS_PNG_AUX_CONF_FILENAME := overrideEncodingSUBLTS.txt
 
-$(MODULE): $(TOOL_OUTPUT) 
+$(MODULE): $(TOOL_OUTPUT)
 #
 # Font file creation from an input PNG image named $(INPUT_FONT_GLYPHS_PNG_FILENAME)
 # The $(INPUT_FONT_GLYPHS_PNG_AUX_CONF_FILENAME) is used to configure the font creation
@@ -41,7 +44,7 @@ $(FONT_OUTPUT): $(BLADERUNNER_SUBTITLES_SAMPLE_INPUT_FOLDER)/$(INPUT_FONT_GLYPHS
 # The $(INPUT_TRANSCRIPT_AUX_CONF_FILENAME) file is used to configure the creation of the mix file
 # This command sequence will erase any intermediate resource files (.TRE) at the end.
 # The $(FONT_OUTPUT) file will not be erased.
-$(TOOL_OUTPUT): $(FONT_OUTPUT) $(BLADERUNNER_SUBTITLES_SAMPLE_INPUT_FOLDER)/$(INPUT_TRANSCRIPT_FILENAME) $(BLADERUNNER_SUBTITLES_SAMPLE_INPUT_FOLDER)/$(INPUT_TRANSCRIPT_AUX_CONF_FILENAME) $(BLADERUNNER_SUBTITLES_SCRIPTS_ROOT_FOLDER)/common/actornames.txt
+$(TOOL_OUTPUT): $(FONT_OUTPUT) $(INPUT_TRANSCRIPT_FILEPATH) $(BLADERUNNER_SUBTITLES_SAMPLE_INPUT_FOLDER)/$(INPUT_TRANSCRIPT_AUX_CONF_FILENAME) $(BLADERUNNER_SUBTITLES_SCRIPTS_ROOT_FOLDER)/common/actornames.txt
 	$(info ---------)
 	$(info Creating Blade Runner subtitles MIX file: $(TOOL_OUTPUT)...)
 	$(info This process assumes that the folder: )
@@ -52,5 +55,5 @@ $(TOOL_OUTPUT): $(FONT_OUTPUT) $(BLADERUNNER_SUBTITLES_SAMPLE_INPUT_FOLDER)/$(IN
 	$(info If successful, a $(TOOL_OUTPUT) file will be created in your working directory)
 	$(info Please, copy this $(TOOL_OUTPUT) into your Blade Runner game directory!)
 	$(info ---------)
-	$(BLADERUNNER_SUBTITLES_SCRIPTS_ROOT_FOLDER)/mixResourceCreator/mixResourceCreator.py -x $(BLADERUNNER_SUBTITLES_SAMPLE_INPUT_FOLDER)/$(INPUT_TRANSCRIPT_FILENAME) -ian $(BLADERUNNER_SUBTITLES_SCRIPTS_ROOT_FOLDER)/common/actornames.txt -cft $(BLADERUNNER_SUBTITLES_SAMPLE_INPUT_FOLDER)/$(INPUT_TRANSCRIPT_AUX_CONF_FILENAME)
+	$(BLADERUNNER_SUBTITLES_SCRIPTS_ROOT_FOLDER)/mixResourceCreator/mixResourceCreator.py -x $(INPUT_TRANSCRIPT_FILEPATH) -ian $(BLADERUNNER_SUBTITLES_SCRIPTS_ROOT_FOLDER)/common/actornames.txt -cft $(BLADERUNNER_SUBTITLES_SAMPLE_INPUT_FOLDER)/$(INPUT_TRANSCRIPT_AUX_CONF_FILENAME)
 	-$(RM) $(INTERMEDIATE_RESOURCE_FILES_UI) $(INTERMEDIATE_RESOURCE_FILES_SUBS)