[Scummvm-cvs-logs] scummvm-tools master -> e305f5e098748a44ecf26af9b8fb3d70ad0d8460

[Kirben]

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

Summary:
e305f5e098 TOOLS: Add create_sjisfnt to Windows installer.


Commit: e305f5e098748a44ecf26af9b8fb3d70ad0d8460
    https://github.com/scummvm/scummvm-tools/commit/e305f5e098748a44ecf26af9b8fb3d70ad0d8460
Author: Travis Howell (kirben at optusnet.com.au)
Date: 2011-10-06T17:12:55-07:00

Commit Message:
TOOLS: Add create_sjisfnt to Windows installer.

Changed paths:
    Makefile
    dists/win32/ScummVM Tools.iss



diff --git a/Makefile b/Makefile
index eca02dd..d73a81d 100644
--- a/Makefile
+++ b/Makefile
@@ -90,6 +90,8 @@ win32dist:   all
 	cp gui/media/detaillogo.jpg $(WIN32PATH)/tools/media/
 	cp gui/media/logo.jpg $(WIN32PATH)/tools/media/
 	cp gui/media/tile.gif $(WIN32PATH)/tools/media/
+	$(STRIP) construct_mohawk.exe -o $(WIN32PATH)/tools/construct_mohawk.exe
+	$(STRIP) create_sjisfnt.exe -o $(WIN32PATH)/tools/create_sjisfnt.exe
 	$(STRIP) decine.exe -o $(WIN32PATH)/tools/decine.exe
 	$(STRIP) degob.exe -o $(WIN32PATH)/tools/degob.exe
 	$(STRIP) dekyra.exe -o $(WIN32PATH)/tools/dekyra.exe
@@ -97,7 +99,6 @@ win32dist:   all
 	$(STRIP) descumm.exe -o $(WIN32PATH)/tools/descumm.exe
 	$(STRIP) desword2.exe -o $(WIN32PATH)/tools/desword2.exe
 	$(STRIP) extract_mohawk.exe -o $(WIN32PATH)/tools/extract_mohawk.exe
-	$(STRIP) construct_mohawk.exe -o $(WIN32PATH)/tools/construct_mohawk.exe
 	$(STRIP) gob_loadcalc.exe -o $(WIN32PATH)/tools/gob_loadcalc.exe
 	$(STRIP) scummvm-tools.exe -o $(WIN32PATH)/tools/scummvm-tools.exe
 	$(STRIP) scummvm-tools-cli.exe -o $(WIN32PATH)/tools/scummvm-tools-cli.exe
@@ -118,6 +119,8 @@ win32setup: all
 	cp $(srcdir)/NEWS             $(srcdir)/$(WIN32BUILD)
 	cp $(srcdir)/README           $(srcdir)/$(WIN32BUILD)
 	unix2dos $(srcdir)/$(WIN32BUILD)/*.*
+	$(STRIP) construct_mohawk.exe   -o $(srcdir)/$(WIN32BUILD)/construct_mohawk.exe
+	$(STRIP) create_sjisfnt.exe     -o $(srcdir)/$(WIN32BUILD)/create_sjisfnt.exe
 	$(STRIP) decine.exe             -o $(srcdir)/$(WIN32BUILD)/decine.exe
 	$(STRIP) degob.exe              -o $(srcdir)/$(WIN32BUILD)/degob.exe
 	$(STRIP) dekyra.exe             -o $(srcdir)/$(WIN32BUILD)/dekyra.exe
@@ -125,7 +128,6 @@ win32setup: all
 	$(STRIP) descumm.exe            -o $(srcdir)/$(WIN32BUILD)/descumm.exe
 	$(STRIP) desword2.exe           -o $(srcdir)/$(WIN32BUILD)/desword2.exe
 	$(STRIP) extract_mohawk.exe     -o $(srcdir)/$(WIN32BUILD)/extract_mohawk.exe
-	$(STRIP) construct_mohawk.exe   -o $(srcdir)/$(WIN32BUILD)/construct_mohawk.exe
 	$(STRIP) gob_loadcalc.exe       -o $(srcdir)/$(WIN32BUILD)/gob_loadcalc.exe
 	$(STRIP) scummvm-tools.exe      -o $(srcdir)/$(WIN32BUILD)/scummvm-tools.exe
 	$(STRIP) scummvm-tools-cli.exe  -o $(srcdir)/$(WIN32BUILD)/scummvm-tools-cli.exe
diff --git a/dists/win32/ScummVM Tools.iss b/dists/win32/ScummVM Tools.iss
index ffc34e3..344a514 100755
--- a/dists/win32/ScummVM Tools.iss	
+++ b/dists/win32/ScummVM Tools.iss	
@@ -25,6 +25,7 @@ WizardImageFile=graphics\left.bmp
 Source: "tools\construct_mohawk.exe"; DestDir: "{app}"; Flags: ignoreversion 

 Source: "tools\convert_dxa.bat"; DestDir: "{app}"; Flags: ignoreversion 

 Source: "tools\COPYING.txt"; DestDir: "{app}"; Flags: ignoreversion  

+Source: "tools\create_sjisfnt.exe"; DestDir: "{app}"; Flags: ignoreversion 

 Source: "tools\decine.exe"; DestDir: "{app}"; Flags: ignoreversion 

 Source: "tools\degob.exe"; DestDir: "{app}"; Flags: ignoreversion 

 Source: "tools\dekyra.exe"; DestDir: "{app}"; Flags: ignoreversion