Merge remote branch 'upstream/master' into t7g-ios

Conflicts:
	engines/groovie/script.cpp

16 files changed, 30 insertions, 59 deletions

diff --git a/devtools/create_project/codeblocks.cpp b/devtools/create_project/codeblocks.cpp
index 8ca139e515..e73dc11089 100644
--- a/devtools/create_project/codeblocks.cpp
+++ b/devtools/create_project/codeblocks.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #include "config.h"
diff --git a/devtools/create_project/codeblocks.h b/devtools/create_project/codeblocks.h
index ba75daeafd..8d35eb068e 100644
--- a/devtools/create_project/codeblocks.h
+++ b/devtools/create_project/codeblocks.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef TOOLS_CREATE_PROJECT_CODEBLOCKS_H
diff --git a/devtools/create_project/config.h b/devtools/create_project/config.h
index 1609e9e99a..fecd95691e 100644
--- a/devtools/create_project/config.h
+++ b/devtools/create_project/config.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef TOOLS_CREATE_PROJECT_CONFIG_H
diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp
index de82dd1698..17b3d29d0b 100644
--- a/devtools/create_project/create_project.cpp
+++ b/devtools/create_project/create_project.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 // HACK to allow building with the SDL backend on MinGW
@@ -639,7 +636,7 @@ bool setEngineBuildState(const std::string &name, EngineDescList &engines, bool
 		if (engine != engines.end()) {
 			engine->enable = enable;
 
-			// When we disable an einge, we also need to disable all the sub engines.
+			// When we disable an engine, we also need to disable all the sub engines.
 			if (!enable && !engine->subEngines.empty()) {
 				for (StringList::const_iterator j = engine->subEngines.begin(); j != engine->subEngines.end(); ++j) {
 					EngineDescList::iterator subEngine = std::find(engines.begin(), engines.end(), *j);
@@ -741,7 +738,6 @@ const Feature s_features[] = {
 	{     "mt32emu",     "USE_MT32EMU",         "", true, "integrated MT-32 emulator" },
 	{        "nasm",        "USE_NASM",         "", true, "IA-32 assembly support" }, // This feature is special in the regard, that it needs additional handling.
 	{      "opengl",      "USE_OPENGL", "opengl32", true, "OpenGL support" },
-	{      "indeo3",      "USE_INDEO3",         "", true, "Indeo3 codec support"},
 	{ "translation", "USE_TRANSLATION",         "", true, "Translation support" },
 	{      "vkeybd",   "ENABLE_VKEYBD",         "", false, "Virtual keyboard support"},
 	{  "langdetect",  "USE_DETECTLANG",         "", true, "System language detection support" } // This feature actually depends on "translation", there
diff --git a/devtools/create_project/create_project.h b/devtools/create_project/create_project.h
index e4ccd7313a..9b9e4cfd1b 100644
--- a/devtools/create_project/create_project.h
+++ b/devtools/create_project/create_project.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef TOOLS_CREATE_PROJECT_H
diff --git a/devtools/create_project/module.mk b/devtools/create_project/module.mk
index 4382fe176c..4238452c5d 100644
--- a/devtools/create_project/module.mk
+++ b/devtools/create_project/module.mk
@@ -1,5 +1,3 @@
-# $URL$
-# $Id$
 
 MODULE := devtools/create_project
 
diff --git a/devtools/create_project/msbuild.cpp b/devtools/create_project/msbuild.cpp
index f9a2e936f0..f8ce80acfd 100644
--- a/devtools/create_project/msbuild.cpp
+++ b/devtools/create_project/msbuild.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #include "config.h"
diff --git a/devtools/create_project/msbuild.h b/devtools/create_project/msbuild.h
index 98bb65e19b..681c893d95 100644
--- a/devtools/create_project/msbuild.h
+++ b/devtools/create_project/msbuild.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef TOOLS_CREATE_PROJECT_MSBUILD_H
diff --git a/devtools/create_project/msvc.cpp b/devtools/create_project/msvc.cpp
index af3aa4a519..aa347b1081 100644
--- a/devtools/create_project/msvc.cpp
+++ b/devtools/create_project/msvc.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #include "config.h"
diff --git a/devtools/create_project/msvc.h b/devtools/create_project/msvc.h
index 6c8ac33a76..ead4bf949a 100644
--- a/devtools/create_project/msvc.h
+++ b/devtools/create_project/msvc.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef TOOLS_CREATE_PROJECT_MSVC_H
diff --git a/devtools/create_project/scripts/installer.vbs b/devtools/create_project/scripts/installer.vbs
index 6bcd794bef..d752355acd 100644
--- a/devtools/create_project/scripts/installer.vbs
+++ b/devtools/create_project/scripts/installer.vbs
@@ -73,7 +73,7 @@ Sub CreateInstaller()
 	Dim commandLine : commandLine = """" & nsisPath & "\makensis.exe"" /V2" & _
 	                                " /Dtop_srcdir=""" & rootFolder & """" & _
 	                                " /Dbuild_dir=""" & targetFolder & """" & _
-	                                " /Dtext_dir=""" & targetFolder & """" & _
+	                                " /Dtext_dir=""" & rootFolder & """" & _
 	                                " /DARCH=""" & arch & """" & _
 	                                " """ & rootFolder & "\dists\nsis\scummvm.nsi"""
 
diff --git a/devtools/create_project/scripts/postbuild.cmd b/devtools/create_project/scripts/postbuild.cmd
index e78861463a..a5051d8228 100644
--- a/devtools/create_project/scripts/postbuild.cmd
+++ b/devtools/create_project/scripts/postbuild.cmd
@@ -23,29 +23,30 @@ if "%~5"=="" goto error_installer
 echo Copying data files

 echo.

 

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

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

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

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

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

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

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

-

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

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

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

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

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

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

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

-

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

+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 "%~1/backends/vkeybd/packs/vkeybd_default.zip" "%~2" 1>NUL 2>&1

 

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

 

 echo Running installer script

 echo.

-@call cscript "%~1/devtools/create_project/scripts/installer.vbs" %~1 %~2 %~3 1>NUL

+@call cscript "%~1/devtools/create_project/scripts/installer.vbs" "%~1" "%~2" "%~3" 1>NUL

 if not %errorlevel% == 0 goto error_script

 goto done

 

diff --git a/devtools/create_project/scripts/prebuild.cmd b/devtools/create_project/scripts/prebuild.cmd
index dd4d12a851..fbab426137 100644
--- a/devtools/create_project/scripts/prebuild.cmd
+++ b/devtools/create_project/scripts/prebuild.cmd
@@ -14,7 +14,7 @@ if "%~1"=="" goto error_root
 if "%~2"=="" goto error_target

 

 REM Run the revision script

-@call cscript "%~1/devtools/create_project/scripts/revision.vbs" %~1 %~2 1>NUL

+@call cscript "%~1/devtools/create_project/scripts/revision.vbs" "%~1" "%~2" 1>NUL

 if not %errorlevel% == 0 goto error_script

 goto done

 

diff --git a/devtools/create_project/scripts/revision.vbs b/devtools/create_project/scripts/revision.vbs
index 3e1212521c..e6fef57030 100644
--- a/devtools/create_project/scripts/revision.vbs
+++ b/devtools/create_project/scripts/revision.vbs
@@ -80,6 +80,7 @@ Sub DetermineRevision()
 				If Not DetermineGitVersion() Then
 					If Not DetermineHgVersion() Then
 						Wscript.StdErr.WriteLine "Could not determine the current revision, skipping..."
+						OutputRevisionHeader ""
 						Exit Sub
 					End If
 				End If
@@ -91,6 +92,7 @@ Sub DetermineRevision()
 				If Not DetermineTortoiseSVNVersion() Then
 					If Not DetermineSVNVersion() Then
 						Wscript.StdErr.WriteLine "Could not determine the current revision, skipping..."
+						OutputRevisionHeader ""
 						Exit Sub
 					End If
 				End If
@@ -121,9 +123,13 @@ Sub DetermineRevision()
 	
 	Wscript.StdErr.WriteLine outputInfo & vbCrLf
 
-	' Output revision header file
+	OutputRevisionHeader revisionString
+End Sub
+
+' Output revision header file
+Sub OutputRevisionHeader(str)
 	FSO.CopyFile rootFolder & "\\base\\internal_revision.h.in", targetFolder & "\\internal_revision.h"
-	FindReplaceInFile targetFolder & "\\internal_revision.h", "@REVISION@", revisionString
+	FindReplaceInFile targetFolder & "\\internal_revision.h", "@REVISION@", str
 End Sub
 
 Function DetermineTortoiseSVNVersion()
diff --git a/devtools/create_project/visualstudio.cpp b/devtools/create_project/visualstudio.cpp
index 8642f071ff..4fadfd2509 100644
--- a/devtools/create_project/visualstudio.cpp
+++ b/devtools/create_project/visualstudio.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #include "config.h"
diff --git a/devtools/create_project/visualstudio.h b/devtools/create_project/visualstudio.h
index 0e4b441e63..dad923e49c 100644
--- a/devtools/create_project/visualstudio.h
+++ b/devtools/create_project/visualstudio.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef TOOLS_CREATE_PROJECT_VISUALSTUDIO_H