Merge remote branch 'upstream/master' into pegasus

4 files changed, 22 insertions, 30 deletions

diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp
index 29bc5bfcd5..0b190b3f0e 100644
--- a/devtools/create_project/create_project.cpp
+++ b/devtools/create_project/create_project.cpp
@@ -364,6 +364,11 @@ int main(int argc, char *argv[]) {
 
 		provider = new CreateProjectTool::CodeBlocksProvider(globalWarnings, projectWarnings);
 
+
+		// Those libraries are automatically added by MSVC, but we need to add them manually with mingw
+		setup.libraries.push_back("ole32");
+		setup.libraries.push_back("uuid");
+
 		break;
 
 	case kProjectMSVC:
@@ -768,12 +773,14 @@ const Feature s_features[] = {
 	{  "theora",   "USE_THEORADEC", "libtheora_static", true, "Theora decoding support" },
 
 	// Feature flags
+	{        "bink",        "USE_BINK",         "", true, "Bink video support" },
 	{     "scalers",     "USE_SCALERS",         "", true, "Scalers" },
 	{   "hqscalers",  "USE_HQ_SCALERS",         "", true, "HQ scalers" },
 	{       "16bit",   "USE_RGB_COLOR",         "", true, "16bit color support" },
 	{     "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" },
+	{     "taskbar",     "USE_TASKBAR",         "", true, "Taskbar integration 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/msvc10/create_project.vcxproj b/devtools/create_project/msvc10/create_project.vcxproj
index 3d7f8fdd3d..40c515f26b 100644
--- a/devtools/create_project/msvc10/create_project.vcxproj
+++ b/devtools/create_project/msvc10/create_project.vcxproj
@@ -59,11 +59,11 @@
     </Link>
     <PostBuildEvent>
       <Command>@echo off
-xcopy /Y $(TargetPath) $(SolutionDir)\..\..\..\dists\msvc10\
-xcopy /Y $(TargetPath) $(SolutionDir)\..\..\..\dists\msvc9\
-xcopy /Y $(TargetPath) $(SolutionDir)\..\..\..\dists\msvc8\
-xcopy /Y $(TargetPath) $(SolutionDir)\..\..\..\dists\codeblocks\
-xcopy /Y $(TargetPath) $(SolutionDir)\..\..\..\dists\iphone\</Command>
+xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc10\"
+xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc9\"
+xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc8\"
+xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\codeblocks\"
+xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\iphone\"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -84,10 +84,12 @@ xcopy /Y $(TargetPath) $(SolutionDir)\..\..\..\dists\iphone\</Command>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
     <PostBuildEvent>
-      <Command>xcopy /Y $(TargetPath) $(SolutionDir)\..\..\..\dists\msvc10\
-xcopy /Y $(TargetPath) $(SolutionDir)\..\..\..\dists\msvc9\
-xcopy /Y $(TargetPath) $(SolutionDir)\..\..\..\dists\msvc8\
-xcopy /Y $(TargetPath) $(SolutionDir)\..\..\..\dists\codeblocks\</Command>
+      <Command>@echo off
+xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc10\"
+xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc9\"
+xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc8\"
+xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\codeblocks\"
+xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\iphone\"</Command>
     </PostBuildEvent>
     <PreBuildEvent>
       <Command>
@@ -120,4 +122,4 @@ xcopy /Y $(TargetPath) $(SolutionDir)\..\..\..\dists\codeblocks\</Command>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
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