Merge remote-tracking branch 'origin/master' into soltys_wip2

5 files changed, 13 insertions, 30 deletions

diff --git a/devtools/convbdf.c b/devtools/convbdf.c
index 4b1640dba7..e465b77a9c 100644
--- a/devtools/convbdf.c
+++ b/devtools/convbdf.c
@@ -721,7 +721,7 @@ int gen_c_source(struct font* pf, char *path) {
 	char bbuf[256];
 	char hdr1[] = {
 		"/* Generated by convbdf on %s. */\n"
-		"#include \"graphics/font.h\"\n"
+		"#include \"graphics/fonts/bdf.h\"\n"
 		"\n"
 		"/* Font information:\n"
 		"   name: %s\n"
@@ -890,7 +890,7 @@ int gen_c_source(struct font* pf, char *path) {
 
 	fprintf(ofp,
 			"/* Exported structure definition. */\n"
-			"static const FontDesc desc = {\n"
+			"static const BdfFontDesc desc = {\n"
 			"\t" "\"%s\",\n"
 			"\t" "%d,\n"
 			"\t" "%d,\n"
@@ -917,7 +917,7 @@ int gen_c_source(struct font* pf, char *path) {
 			pf->defaultchar);
 
 	fprintf(ofp, "\n" "#if !(defined(__GP32__))\n");
-	fprintf(ofp, "extern const NewFont g_sysfont(desc);\n");
+	fprintf(ofp, "extern const BdfFont g_sysfont(desc);\n");
 	fprintf(ofp, "#else\n");
 	fprintf(ofp, "DEFINE_FONT(g_sysfont)\n");
 	fprintf(ofp, "#endif\n");
diff --git a/devtools/create_project/scripts/installer.vbs b/devtools/create_project/scripts/installer.vbs
index d752355acd..19b4eee49b 100644
--- a/devtools/create_project/scripts/installer.vbs
+++ b/devtools/create_project/scripts/installer.vbs
@@ -72,10 +72,9 @@ Sub CreateInstaller()
 	' Build command line
 	Dim commandLine : commandLine = """" & nsisPath & "\makensis.exe"" /V2" & _
 	                                " /Dtop_srcdir=""" & rootFolder & """" & _
-	                                " /Dbuild_dir=""" & targetFolder & """" & _
-	                                " /Dtext_dir=""" & rootFolder & """" & _
+	                                " /Dstaging_dir=""" & targetFolder & """" & _
 	                                " /DARCH=""" & arch & """" & _
-	                                " """ & rootFolder & "\dists\nsis\scummvm.nsi"""
+	                                " """ & rootFolder & "\dists\win32\scummvm.nsi"""
 
 	Dim oExec: Set oExec = WshShell.Exec(commandline)
 	If Err.Number <> 0 Then
diff --git a/devtools/create_project/scripts/postbuild.cmd b/devtools/create_project/scripts/postbuild.cmd
index a5051d8228..dd52c0217c 100644
--- a/devtools/create_project/scripts/postbuild.cmd
+++ b/devtools/create_project/scripts/postbuild.cmd
@@ -23,23 +23,7 @@ if "%~5"=="" goto error_installer
 echo Copying data files

 echo.

 

-REM xcopy /F /Y "%~1/AUTHORS" %~2       1>NUL 2>&1

-REM xcopy /F /Y "%~1/COPYING.GPL" %~2   1>NUL 2>&1

-REM xcopy /F /Y "%~1/COPYING" %~2       1>NUL 2>&1

-REM xcopy /F /Y "%~1/COPYING.LGPL" %~2  1>NUL 2>&1

-REM xcopy /F /Y "%~1/COPYRIGHT" %~2     1>NUL 2>&1

-REM xcopy /F /Y "%~1/NEWS" %~2          1>NUL 2>&1

-REM xcopy /F /Y "%~1/README" %~2        1>NUL 2>&1

-

-REM xcopy /F /Y "%~1/dists/engine-data/*.dat" %~2     1>NUL 2>&1

-REM xcopy /F /Y "%~1/dists/engine-data/*.tbl" %~2     1>NUL 2>&1

-REM xcopy /F /Y "%~1/dists/engine-data/*.cpt" %~2     1>NUL 2>&1

-REM xcopy /F /Y "%~1/gui/themes/*.zip" %~2            1>NUL 2>&1

-REM xcopy /F /Y "%~1/gui/themes/translations.dat" %~2 1>NUL 2>&1

-

-xcopy /F /Y "%~4/lib/%~3/SDL.dll" "%~2"             1>NUL 2>&1

-xcopy /F /Y "%~4/README-SDL" "%~2"                  1>NUL 2>&1

-

+xcopy /F /Y "%~4/lib/%~3/SDL.dll"                          "%~2" 1>NUL 2>&1

 xcopy /F /Y "%~1/backends/vkeybd/packs/vkeybd_default.zip" "%~2" 1>NUL 2>&1

 

 if "%~5"=="0" goto done

diff --git a/devtools/credits.pl b/devtools/credits.pl
index de669184e1..a124314670 100755
--- a/devtools/credits.pl
+++ b/devtools/credits.pl
@@ -467,7 +467,7 @@ begin_credits("Credits");
 		  add_person("Jonathan Gray", "khalek", "(retired)");
 		  add_person("Vincent Hamm", "yaz0r", "(retired)");
 		  add_person("Max Horn", "Fingolfin", "(retired)");
-		  add_person("Travis Howell", "Kirben", "(retired)");
+		  add_person("Travis Howell", "Kirben", "");
 		  add_person("Pawe&#322; Ko&#322;odziejski", "aquadran", "Codecs, iMUSE, Smush, etc.");
 		  add_person("Gregory Montoir", "cyx", "");
 		  add_person("Eugene Sandulenko", "sev", "FT INSANE, MM NES, MM C64, game detection, Herc/CGA");
@@ -476,7 +476,7 @@ begin_credits("Credits");
 
 	  begin_section("HE");
 		  add_person("Jonathan Gray", "khalek", "(retired)");
-		  add_person("Travis Howell", "Kirben", "(retired)");
+		  add_person("Travis Howell", "Kirben", "");
 		  add_person("Gregory Montoir", "cyx", "");
 		  add_person("Eugene Sandulenko", "sev", "");
 	  end_section();
@@ -486,7 +486,7 @@ begin_credits("Credits");
 		  add_person("Matthew Hoops", "clone2727", "");
 		  add_person("Filippos Karapetis", "[md5]", "");
 		  add_person("Pawe&#322; Ko&#322;odziejski", "aquadran", "");
-		  add_person("Walter van Niftrik", "waltervn", "");
+		  add_person("Walter van Niftrik", "waltervn", "(retired)");
 		  add_person("Kari Salminen", "Buddha^", "");
 		  add_person("Eugene Sandulenko", "sev", "");
 		  add_person("David Symonds", "dsymonds", "(retired)");
@@ -495,7 +495,7 @@ begin_credits("Credits");
 	  begin_section("AGOS");
 		  add_person("Torbj&ouml;rn Andersson", "eriktorbjorn", "");
 		  add_person("Paul Gilbert", "dreammaster", "");
-		  add_person("Travis Howell", "Kirben", "(retired)");
+		  add_person("Travis Howell", "Kirben", "");
 		  add_person("Oliver Kiehl", "olki", "(retired)");
 		  add_person("Ludvig Strigeus", "ludde", "(retired)");
 	  end_section();
@@ -609,7 +609,7 @@ begin_credits("Credits");
 		  add_person("Max Horn", "Fingolfin", "(retired)");
 		  add_person("Filippos Karapetis", "[md5]", "");
 		  add_person("Martin Kiewitz", "m_kiewitz", "");
-		  add_person("Walter van Niftrik", "waltervn", "");
+		  add_person("Walter van Niftrik", "waltervn", "(retired)");
 		  add_person("Willem Jan Palenstijn", "wjp", "");
 		  add_person("Jordi Vilalta Prat", "jvprat", "");
 		  add_person("Lars Skovlund", "lskovlun", "");
@@ -878,7 +878,7 @@ begin_credits("Credits");
 	  end_section();
 
 	  begin_section("Win32");
-		  add_person("Travis Howell", "Kirben", "(retired)");
+		  add_person("Travis Howell", "Kirben", "");
 	  end_section();
 
 	  begin_section("Win64");
diff --git a/devtools/update-version.pl b/devtools/update-version.pl
index 788cbc7e40..169fba7788 100755
--- a/devtools/update-version.pl
+++ b/devtools/update-version.pl
@@ -39,7 +39,7 @@ my @subs_files = qw(
 	dists/macosx/Info.plist
 	dists/iphone/Info.plist
 	dists/irix/scummvm.spec
-	dists/nsis/scummvm.nsi
+	dists/win32/scummvm.nsi
 	dists/wii/meta.xml
 	dists/android/AndroidManifest.xml
 	dists/android/plugin-manifest.xml