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

Conflicts:
	common/coroutines.cpp
	common/coroutines.h
	devtools/create_project/msbuild.cpp
	devtools/create_project/visualstudio.cpp

25 files changed, 136 insertions, 31 deletions

diff --git a/dists/android/AndroidManifest.xml b/dists/android/AndroidManifest.xml
index e7778fdf61..a3c02474eb 100644
--- a/dists/android/AndroidManifest.xml
+++ b/dists/android/AndroidManifest.xml
@@ -4,7 +4,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 		package="org.scummvm.scummvm"
 		android:versionCode="@ANDROID_VERSIONCODE@"
-		android:versionName="1.5.0git"
+		android:versionName="1.6.0git"
 		android:installLocation="preferExternal"
 		android:sharedUserId="org.scummvm.scummvm">
 
diff --git a/dists/android/plugin-manifest.xml b/dists/android/plugin-manifest.xml
index 51b39be3b1..7855c330c6 100644
--- a/dists/android/plugin-manifest.xml
+++ b/dists/android/plugin-manifest.xml
@@ -3,7 +3,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 		package="org.scummvm.scummvm.plugin.@PLUGIN_NAME@"
 		android:versionCode="@PLUGIN_VERSION_CODE@"
-		android:versionName="1.5.0git"
+		android:versionName="1.6.0git"
 		android:installLocation="preferExternal"
 		android:sharedUserId="org.scummvm.scummvm">
 
diff --git a/dists/engine-data/drascula.dat b/dists/engine-data/drascula.dat
index 0938ef4a9a..e2b046a527 100644
--- a/dists/engine-data/drascula.dat
+++ b/dists/engine-data/drascula.dat
diff --git a/dists/engine-data/kyra.dat b/dists/engine-data/kyra.dat
index c89b21cbca..339b85664a 100644
--- a/dists/engine-data/kyra.dat
+++ b/dists/engine-data/kyra.dat
diff --git a/dists/engine-data/teenagent.dat b/dists/engine-data/teenagent.dat
index 0dd31dad14..1492326920 100644
--- a/dists/engine-data/teenagent.dat
+++ b/dists/engine-data/teenagent.dat
diff --git a/dists/gph/README-GPH b/dists/gph/README-GPH
index 29f0175306..974c2cf266 100644
--- a/dists/gph/README-GPH
+++ b/dists/gph/README-GPH
@@ -1,4 +1,4 @@
-ScummVM 1.5.0git - GPH DEVICE SPECIFIC README
+ScummVM 1.6.0git - GPH DEVICE SPECIFIC README
 
 ------------------------------------------------------------------------
 
diff --git a/dists/gph/scummvm.ini b/dists/gph/scummvm.ini
index 952cd0de24..7d9d85fcc2 100644
--- a/dists/gph/scummvm.ini
+++ b/dists/gph/scummvm.ini
@@ -1,5 +1,5 @@
 [info]
-name="ScummVM 1.5.0git"
+name="ScummVM 1.6.0git"
 path="/scummvm/scummvm.gpe"
 icon="/scummvm/scummvm.png"
 title="/scummvm/scummvmb.png"
diff --git a/dists/iphone/Info.plist b/dists/iphone/Info.plist
index e25cee51ea..2f6ba85b00 100644
--- a/dists/iphone/Info.plist
+++ b/dists/iphone/Info.plist
@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.0git</string>
+	<string>1.6.0git</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.5.0git</string>
+	<string>1.6.0git</string>
 	<key>CFBundleIconFile</key>
 	<string>icon.png</string>
 	<key>CFBundleIconFiles</key>
diff --git a/dists/irix/scummvm.spec b/dists/irix/scummvm.spec
index 2e099d94a8..bbdf31cc2c 100644
--- a/dists/irix/scummvm.spec
+++ b/dists/irix/scummvm.spec
@@ -1,5 +1,5 @@
 product scummvm
-    id "ScummVM 1.5.0git"
+    id "ScummVM 1.6.0git"
     image sw
         id "software"
         version 18
diff --git a/dists/macosx/Info.plist b/dists/macosx/Info.plist
index 94adc00a9b..d8c28f6a08 100644
--- a/dists/macosx/Info.plist
+++ b/dists/macosx/Info.plist
@@ -28,7 +28,7 @@
 	<key>CFBundleExecutable</key>
 	<string>scummvm</string>
 	<key>CFBundleGetInfoString</key>
-	<string>1.5.0git, Copyright 2001-2012 The ScummVM team</string>
+	<string>1.6.0git, Copyright 2001-2012 The ScummVM team</string>
 	<key>CFBundleIconFile</key>
 	<string>scummvm.icns</string>
 	<key>CFBundleIdentifier</key>
@@ -40,9 +40,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.0git</string>
+	<string>1.6.0git</string>
 	<key>CFBundleVersion</key>
-	<string>1.5.0git</string>
+	<string>1.6.0git</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
 	<key>NSHumanReadableCopyright</key>
diff --git a/dists/msvc11/create_msvc11.bat b/dists/msvc11/create_msvc11.bat
new file mode 100644
index 0000000000..b6a5413e3b
--- /dev/null
+++ b/dists/msvc11/create_msvc11.bat
@@ -0,0 +1,95 @@
+@echo off
+
+echo.
+echo Automatic creation of the MSVC11 project files
+echo.
+
+if "%~1"=="/stable" goto stable
+if "%~1"=="/STABLE" goto stable
+if "%~1"=="/all"    goto all
+if "%~1"=="/ALL"    goto all
+if "%~1"=="/tools"  goto tools
+if "%~1"=="/TOOLS"  goto tools
+if "%~1"=="/clean"  goto clean_check
+if "%~1"=="/CLEAN"  goto clean_check
+if "%~1"=="/help"   goto command_help
+if "%~1"=="/HELP"   goto command_help
+if "%~1"=="/?"      goto command_help
+
+if "%~1"==""        goto check_tool
+
+echo Invalid command parameter: %~1
+echo.
+
+:command_help
+echo Valid command parameters are:
+echo   stable   Generated stable engines project files
+echo   all      Generate all engines project files
+echo   tools    Generate project files for the devtools
+echo   clean    Clean generated project files
+echo   help     Show help message
+goto done
+
+:check_tool
+if not exist create_project.exe goto no_tool
+
+:question
+echo.
+set batchanswer=S
+set /p batchanswer="Enable stable engines only, or all engines? (S/a)"
+if "%batchanswer%"=="s" goto stable
+if "%batchanswer%"=="S" goto stable
+if "%batchanswer%"=="a" goto all
+if "%batchanswer%"=="A" goto all
+goto question
+
+:no_tool
+echo create_project.exe not found in the current folder.
+echo You need to build it first and copy it in this
+echo folder
+goto done
+
+:all
+echo.
+echo Creating project files with all engines enabled (stable and unstable)
+echo.
+create_project ..\.. --enable-all-engines --msvc --msvc-version 11 --build-events
+goto done
+
+:stable
+echo.
+echo Creating normal project files, with only the stable engines enabled
+echo.
+create_project ..\.. --msvc --msvc-version 11
+goto done
+
+:tools
+echo.
+echo Creating tools project files
+echo.
+create_project ..\.. --tools --msvc --msvc-version 11
+goto done
+
+:clean_check
+echo.
+set cleananswer=N
+set /p cleananswer="This will remove all project files. Are you sure you want to continue? (N/y)"
+if "%cleananswer%"=="n" goto done
+if "%cleananswer%"=="N" goto done
+if "%cleananswer%"=="y" goto clean
+if "%cleananswer%"=="Y" goto clean
+goto clean_check
+
+:clean
+echo.
+echo Removing all project files
+del /Q *.vcxproj* > NUL 2>&1
+del /Q *.props > NUL 2>&1
+del /Q *.sln* > NUL 2>&1
+del /Q scummvm* > NUL 2>&1
+del /Q devtools* > NUL 2>&1
+goto done
+
+:done
+echo.
+pause
diff --git a/dists/msvc11/readme.txt b/dists/msvc11/readme.txt
new file mode 100644
index 0000000000..fa91a8cc12
--- /dev/null
+++ b/dists/msvc11/readme.txt
@@ -0,0 +1,6 @@
+The Visual Studio project files can now be created automatically from the GCC
+files using the create_project tool inside the /devtools/create_project folder.
+
+To create the default project files, build create_project.exe, copy it inside
+this folder and run the create_msvc11.bat file for a default build. You can run
+create_project.exe with no parameters to check the possible command-line options
diff --git a/dists/openpandora/PXML.xml b/dists/openpandora/PXML.xml
index 896210bf01..b759c311ba 100644
--- a/dists/openpandora/PXML.xml
+++ b/dists/openpandora/PXML.xml
@@ -4,11 +4,11 @@
     <package id="scummvm.djwillis.0001">
         <author name="DJWillis" website="http://www.scummvm.org/"/>
         <!-- version type can be alpha, beta or release, set to release in branch -->
-        <version major="1" minor="5" release="0" build="1" type="release"/>
+        <version major="1" minor="6" release="0" build="1" type="release"/>
         <!-- Both title and titles are needed -->
-        <title lang="en_US">ScummVM 1.5.0git</title>
+        <title lang="en_US">ScummVM 1.6.0git</title>
         <titles>
-            <title lang="en_US">ScummVM 1.5.0git</title>
+            <title lang="en_US">ScummVM 1.6.0git</title>
         </titles>
         <descriptions>
             <description lang="en_US">
@@ -25,7 +25,7 @@
         <exec command="./runscummvm.sh"/>
         <author name="DJWillis" website="http://www.scummvm.org/"/>
         <!-- version type can be alpha, beta or release, set to release in branch -->
-        <version major="1" minor="5" release="0" build="1" type="release"/>
+        <version major="1" minor="6" release="0" build="1" type="release"/>
         <!-- Both title and titles are needed -->
         <title lang="en_US">ScummVM</title>
         <titles>
diff --git a/dists/openpandora/README-OPENPANDORA b/dists/openpandora/README-OPENPANDORA
index b3947975c0..e3c7c9d631 100644
--- a/dists/openpandora/README-OPENPANDORA
+++ b/dists/openpandora/README-OPENPANDORA
@@ -1,4 +1,4 @@
-ScummVM 1.5.0git - OPENPANDORA SPECIFIC README
+ScummVM 1.6.0git - OPENPANDORA SPECIFIC README
 ------------------------------------------------------------------------
 Please refer to the:
 
diff --git a/dists/openpandora/README-PND.txt b/dists/openpandora/README-PND.txt
index 240936f755..594ad293ed 100644
--- a/dists/openpandora/README-PND.txt
+++ b/dists/openpandora/README-PND.txt
@@ -1,4 +1,4 @@
-ScummVM 1.5.0git - OPENPANDORA README - HOW TO INSTALL
+ScummVM 1.6.0git - OPENPANDORA README - HOW TO INSTALL
 ------------------------------------------------------------------------
 
 Please refer to the:
diff --git a/dists/openpandora/index.html b/dists/openpandora/index.html
index d7238c1889..5da951546c 100644
--- a/dists/openpandora/index.html
+++ b/dists/openpandora/index.html
@@ -5,7 +5,7 @@
 </h3>
 
 <h4>
-  <p>ScummVM 1.5.0git: OpenPandora Specific Documentation</p>
+  <p>ScummVM 1.6.0git: OpenPandora Specific Documentation</p>
 </h4>
 
 <A href="docs/README-OPENPANDORA">ScummVM OpenPandora README</a><br/>
@@ -13,7 +13,7 @@
 <A href="http://wiki.scummvm.org/index.php/OpenPandora">ScummVM OpenPandora WiKi</a><br/>
 
 <h4>
-  <p>ScummVM 1.5.0git: General Documentation</p>
+  <p>ScummVM 1.6.0git: General Documentation</p>
 </h4>
 
 <A href="http://www.scummvm.org/">ScummVM website</a><br/>
diff --git a/dists/redhat/scummvm-tools.spec b/dists/redhat/scummvm-tools.spec
index 99add8ba85..2f65931a70 100644
--- a/dists/redhat/scummvm-tools.spec
+++ b/dists/redhat/scummvm-tools.spec
@@ -7,7 +7,7 @@
 #   Prologue information
 #------------------------------------------------------------------------------
 Name		: scummvm-tools
-Version		: 1.5.0git
+Version		: 1.6.0git
 Release		: 1
 Summary		: ScummVM-related tools
 Group		: Interpreters
diff --git a/dists/redhat/scummvm.spec b/dists/redhat/scummvm.spec
index 2ccccae79d..bd17017fbf 100644
--- a/dists/redhat/scummvm.spec
+++ b/dists/redhat/scummvm.spec
@@ -7,7 +7,7 @@
 #   Prologue information
 #------------------------------------------------------------------------------
 Name		: scummvm
-Version		: 1.5.0git
+Version		: 1.6.0git
 Release		: 1
 Summary		: Graphic adventure game interpreter
 Group		: Interpreters
@@ -27,6 +27,7 @@ BuildRequires: flac-devel
 BuildRequires: zlib-devel
 BuildRequires: nasm
 BuildRequires: SDL-devel >= 1.2.2
+BuildRequires: freetype-devel
 
 #------------------------------------------------------------------------------
 #   Description
@@ -94,7 +95,7 @@ fi
 #------------------------------------------------------------------------------
 %files
 %defattr(0644,root,root,0755)
-%doc AUTHORS README NEWS COPYING COPYING.LGPL COPYING.BSD COPYRIGHT
+%doc AUTHORS README NEWS COPYING COPYING.LGPL COPYING.FREEFONT COPYING.BSD COPYRIGHT
 %attr(0755,root,root)%{_bindir}/scummvm
 %{_datadir}/applications/*
 %{_datadir}/pixmaps/scummvm.xpm
diff --git a/dists/redhat/scummvm.spec.in b/dists/redhat/scummvm.spec.in
index 3beef2f960..9dbd8add5b 100644
--- a/dists/redhat/scummvm.spec.in
+++ b/dists/redhat/scummvm.spec.in
@@ -27,6 +27,7 @@ BuildRequires: flac-devel
 BuildRequires: zlib-devel
 BuildRequires: nasm
 BuildRequires: SDL-devel >= 1.2.2
+BuildRequires: freetype-devel
 
 #------------------------------------------------------------------------------
 #   Description
@@ -94,7 +95,7 @@ fi
 #------------------------------------------------------------------------------
 %files
 %defattr(0644,root,root,0755)
-%doc AUTHORS README NEWS COPYING COPYING.LGPL COPYING.BSD COPYRIGHT
+%doc AUTHORS README NEWS COPYING COPYING.LGPL COPYING.FREEFONT COPYING.BSD COPYRIGHT
 %attr(0755,root,root)%{_bindir}/scummvm
 %{_datadir}/applications/*
 %{_datadir}/pixmaps/scummvm.xpm
diff --git a/dists/scummvm.6 b/dists/scummvm.6
index b192104684..2075a5c8f5 100644
--- a/dists/scummvm.6
+++ b/dists/scummvm.6
@@ -37,7 +37,7 @@ Output using ALSA sequencer device
 .It Em amidi
 Use the MorphOS MIDI system, for MorphOS users
 .It Em core
-CoreAudio sound, for MacOS X users
+CoreAudio sound, for Mac OS X users
 .It Em mt32
 MT-32 emulation
 .It Em null
diff --git a/dists/scummvm.rc b/dists/scummvm.rc
index e5d28d089a..4a67100f9f 100644
--- a/dists/scummvm.rc
+++ b/dists/scummvm.rc
@@ -14,6 +14,7 @@ IDI_COUNT              ICON    DISCARDABLE     "icons/count.ico"
 
 ID_GDF_XML             DATA    "dists/win32/scummvm.gdf.xml"
 
+scummclassic.zip       FILE    "gui/themes/scummclassic.zip"
 scummmodern.zip        FILE    "gui/themes/scummmodern.zip"
 #ifdef USE_TRANSLATION
 translations.dat       FILE    "gui/themes/translations.dat"
@@ -48,8 +49,8 @@ pred.dic               FILE    "dists/pred.dic"
 #endif
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION     1,5,0,0
- PRODUCTVERSION  1,5,0,0
+ FILEVERSION     1,6,0,0
+ PRODUCTVERSION  1,6,0,0
  FILEFLAGSMASK   VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS       VS_FF_DEBUG
@@ -66,13 +67,13 @@ BEGIN
         BEGIN
             VALUE "Comments", "Look! A three headed monkey (TM)! .. Nice use of the TM!\0"
             VALUE "FileDescription", "http://www.scummvm.org/\0"
-            VALUE "FileVersion", "1.5.0git\0"
+            VALUE "FileVersion", "1.6.0git\0"
             VALUE "InternalName", "scummvm\0"
             VALUE "LegalCopyright", "Copyright © 2001-2012 The ScummVM Team\0"
             VALUE "LegalTrademarks", "'SCUMM', and all SCUMM games are a TM of LucasArts. Simon The Sorcerer is a TM of AdventureSoft. Beneath a Steel Sky and Broken Sword are a TM of Revolution. Flight of the Amazon Queen is a TM of John Passfield and Steve Stamatiadis. \0"
             VALUE "OriginalFilename", "scummvm.exe\0"
             VALUE "ProductName", "ScummVM\0"
-            VALUE "ProductVersion", "1.5.0git\0"
+            VALUE "ProductVersion", "1.6.0git\0"
         END
     END
 
diff --git a/dists/scummvm.rc.in b/dists/scummvm.rc.in
index 6969e0b2a7..a874b98514 100644
--- a/dists/scummvm.rc.in
+++ b/dists/scummvm.rc.in
@@ -14,6 +14,7 @@ IDI_COUNT              ICON    DISCARDABLE     "icons/count.ico"
 
 ID_GDF_XML             DATA    "dists/win32/scummvm.gdf.xml"
 
+scummclassic.zip       FILE    "gui/themes/scummclassic.zip"
 scummmodern.zip        FILE    "gui/themes/scummmodern.zip"
 #ifdef USE_TRANSLATION
 translations.dat       FILE    "gui/themes/translations.dat"
diff --git a/dists/slackware/scummvm.SlackBuild b/dists/slackware/scummvm.SlackBuild
index 4ccc2a8995..076a1d20ea 100755
--- a/dists/slackware/scummvm.SlackBuild
+++ b/dists/slackware/scummvm.SlackBuild
@@ -9,7 +9,7 @@ if [ "$TMP" = "" ]; then
 fi
 PKG=$TMP/package-scummvm
 
-VERSION=1.5.0git
+VERSION=1.6.0git
 ARCH=i486
 BUILD=1
 
diff --git a/dists/wii/meta.xml b/dists/wii/meta.xml
index e843d36e79..5a4c46e144 100644
--- a/dists/wii/meta.xml
+++ b/dists/wii/meta.xml
@@ -2,7 +2,7 @@
 <app version="1">
   <name>ScummVM</name>
   <coder>The ScummVM Team</coder>
-  <version>1.5.0git@REVISION@</version>
+  <version>1.6.0git@REVISION@</version>
   <release_date>@TIMESTAMP@</release_date>
   <short_description>Point &amp; Click Adventures</short_description>
   <long_description>ScummVM is a program which allows you to run certain classic graphical point-and-click adventure games, provided you already have their data files. The clever part about this: ScummVM just replaces the executables shipped with the games, allowing you to play them on systems for which they were never designed!
diff --git a/dists/win32/scummvm.nsi b/dists/win32/scummvm.nsi
index 7ff174befb..795eb660b6 100644
--- a/dists/win32/scummvm.nsi
+++ b/dists/win32/scummvm.nsi
@@ -72,7 +72,7 @@ Name ScummVM
 # General Symbol Definitions
 #########################################################################################
 !define REGKEY      "Software\$(^Name)\$(^Name)"
-!define VERSION     "1.5.0git"
+!define VERSION     "1.6.0git"
 !define COMPANY     "ScummVM Team"
 !define URL         "http://scummvm.org/"
 !define DESCRIPTION "ScummVM Installer. Look! A three headed monkey (TM)!"
@@ -92,7 +92,7 @@ XPStyle  on
 #TargetMinimalOS 5.0    ; Minimal version of windows for installer: Windows 2000 or more recent
                         ; (will build unicode installer with NSIS 2.50+)
 
-VIProductVersion 1.5.0.0
+VIProductVersion 1.6.0.0
 VIAddVersionKey  ProductName      $(^Name)
 VIAddVersionKey  ProductVersion  "${VERSION}"
 VIAddVersionKey  CompanyName     "${COMPANY}"