Merge remote-tracking branch 'upstream/master' into nsis

Conflicts:
	devtools/create_project/scripts/postbuild.cmd
	devtools/create_project/visualstudio.cpp
	ports.mk

13 files changed, 98 insertions, 30 deletions

diff --git a/dists/android/AndroidManifest.xml b/dists/android/AndroidManifest.xml
index cae1f369e7..1bc784cc4c 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.inodes.gus.scummvm"
 		android:versionCode="@ANDROID_VERSIONCODE@"
-		android:versionName="1.3.0git"
+		android:versionName="1.4.0git"
 		android:installLocation="preferExternal">
 
 	<!-- This version works on Android 1.5 (SDK 3) and newer, but we
diff --git a/dists/android/plugin-manifest.xml b/dists/android/plugin-manifest.xml
index 2442d3f32a..3fd9e393d0 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.inodes.gus.scummvm.plugin.@PLUGIN_NAME@"
 		android:versionCode="@PLUGIN_VERSION_CODE@"
-		android:versionName="1.3.0git"
+		android:versionName="1.4.0git"
 		android:installLocation="preferExternal">
 
 	<uses-sdk android:minSdkVersion="3" android:targetSdkVersion="8" />
diff --git a/dists/iphone/Info.plist b/dists/iphone/Info.plist
index f18cc61ede..e57989a7c3 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.3.0git</string>
+	<string>1.4.0git</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.3.0git</string>
+	<string>1.4.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 b6b1524a42..141d37070f 100644
--- a/dists/irix/scummvm.spec
+++ b/dists/irix/scummvm.spec
@@ -1,5 +1,5 @@
 product scummvm
-    id "ScummVM 1.3.0git"
+    id "ScummVM 1.4.0git"
     image sw
         id "software"
         version 18
diff --git a/dists/macosx/Info.plist b/dists/macosx/Info.plist
index 9e19926f3f..20081ccc80 100644
--- a/dists/macosx/Info.plist
+++ b/dists/macosx/Info.plist
@@ -9,7 +9,7 @@
 	<key>CFBundleExecutable</key>
 	<string>scummvm</string>
 	<key>CFBundleGetInfoString</key>
-	<string>1.3.0git, Copyright 2001-2011 The ScummVM team</string>
+	<string>1.4.0git, Copyright 2001-2011 The ScummVM team</string>
 	<key>CFBundleIconFile</key>
 	<string>scummvm.icns</string>
 	<key>CFBundleIdentifier</key>
@@ -21,9 +21,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.0git</string>
+	<string>1.4.0git</string>
 	<key>CFBundleVersion</key>
-	<string>1.3.0git</string>
+	<string>1.4.0git</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
 	<key>NSHumanReadableCopyright</key>
diff --git a/dists/redhat/scummvm-tools.spec b/dists/redhat/scummvm-tools.spec
index b034e4479e..72b1ac701f 100644
--- a/dists/redhat/scummvm-tools.spec
+++ b/dists/redhat/scummvm-tools.spec
@@ -7,7 +7,7 @@
 #   Prologue information
 #------------------------------------------------------------------------------
 Name		: scummvm-tools
-Version		: 1.3.0git
+Version		: 1.4.0git
 Release		: 1
 Summary		: ScummVM-related tools
 Group		: Interpreters
diff --git a/dists/redhat/scummvm.spec b/dists/redhat/scummvm.spec
index d0d273fc66..777e0afc8a 100644
--- a/dists/redhat/scummvm.spec
+++ b/dists/redhat/scummvm.spec
@@ -7,7 +7,7 @@
 #   Prologue information
 #------------------------------------------------------------------------------
 Name		: scummvm
-Version		: 1.3.0git
+Version		: 1.4.0git
 Release		: 1
 Summary		: Graphic adventure game interpreter
 Group		: Interpreters
diff --git a/dists/scummvm.rc b/dists/scummvm.rc
index 61981b30c5..15dd04c0d9 100644
--- a/dists/scummvm.rc
+++ b/dists/scummvm.rc
@@ -7,8 +7,8 @@ IDI_ICON               ICON    DISCARDABLE     "../../icons/scummvm.ico"
 #endif
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION     1,3,0,0
- PRODUCTVERSION  1,3,0,0
+ FILEVERSION     1,4,0,0
+ PRODUCTVERSION  1,4,0,0
  FILEFLAGSMASK   VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS       VS_FF_DEBUG
@@ -25,13 +25,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.3.0git\0"
+            VALUE "FileVersion", "1.4.0git\0"
             VALUE "InternalName", "scummvm\0"
             VALUE "LegalCopyright", "Copyright © 2001-2011 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.3.0git\0"
+            VALUE "ProductVersion", "1.4.0git\0"
         END
     END
 
diff --git a/dists/slackware/scummvm.SlackBuild b/dists/slackware/scummvm.SlackBuild
index 0e5436b85e..71f4818e7e 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.3.0git
+VERSION=1.4.0git
 ARCH=i486
 BUILD=1
 
diff --git a/dists/webos/mojo/scummvmrc-default b/dists/webos/mojo/scummvmrc-default
index d29a0fc6db..aefc5fda98 100644
--- a/dists/webos/mojo/scummvmrc-default
+++ b/dists/webos/mojo/scummvmrc-default
@@ -17,11 +17,7 @@ aspect_ratio=false
 speech_mute=false
 enable_gs=false
 browser_lastpath=/media/internal/ScummVM/Games
-themepath=/media/internal/ScummVM/Themes
 savepath=/media/internal/ScummVM/Saves
-extrapath=/media/internal/ScummVM/Extras
-pluginspath=/media/internal/ScummVM/Plugins
-vkeybdpath=/media/cryptofs/apps/usr/palm/applications/org.scummvm.scummvm/share/scummvm
 
 [keymapper]
 keymap_global_MEN=FORWARD
diff --git a/dists/webos/mojo/start b/dists/webos/mojo/start
index 3bdb9a59d8..446ce83f1d 100755
--- a/dists/webos/mojo/start
+++ b/dists/webos/mojo/start
@@ -4,14 +4,10 @@
 APPDIR=$(readlink -f $(dirname $0))
 SCUMMVMDIR=/media/internal/ScummVM
 
-
 # Create the initial ScummVM directory structure
 mkdir -p $SCUMMVMDIR/Games
 mkdir -p $SCUMMVMDIR/Saves
 mkdir -p $SCUMMVMDIR/Screenshots
-mkdir -p $SCUMMVMDIR/Themes
-mkdir -p $SCUMMVMDIR/Extras
-mkdir -p $SCUMMVMDIR/Plugins
 
 # Install default configuration file if not already present
 if [ ! -f $SCUMMVMDIR/scummvmrc ]
@@ -19,14 +15,8 @@ then
     cp $APPDIR/scummvmrc-default $SCUMMVMDIR/scummvmrc
 fi
 
-# Copy themes to theme directory
-cp -f $APPDIR/share/scummvm/*.zip $SCUMMVMDIR/Themes
-
 # Change into the screenshots directory so screenshots are saved there
 cd $SCUMMVMDIR/Screenshots
 
-# Set library path so the app finds its custom shared libraries
-export LD_LIBRARY_PATH=$APPDIR/lib
-
 # Run the game
 exec $APPDIR/bin/scummvm -c $SCUMMVMDIR/scummvmrc
diff --git a/dists/wii/meta.xml b/dists/wii/meta.xml
index 562d0982f5..68460c4721 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.3.0git@REVISION@</version>
+  <version>1.4.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.iss b/dists/win32/ScummVM.iss
new file mode 100644
index 0000000000..00f4868e60
--- /dev/null
+++ b/dists/win32/ScummVM.iss
@@ -0,0 +1,82 @@
+[Setup]
+DefaultDirName={pf}\ScummVM
+AppCopyright=2011
+AppName=ScummVM
+AppVerName=ScummVM Git
+DefaultGroupName=ScummVM
+AllowNoIcons=true
+AlwaysUsePersonalGroup=false
+EnableDirDoesntExistWarning=false
+Compression=lzma
+OutputDir=C:\ScummVM
+OutputBaseFilename=scummvm-win32
+DisableStartupPrompt=true
+AppendDefaultDirName=false
+SolidCompression=true
+DirExistsWarning=no
+SetupIconFile=scummvm.ico
+ShowLanguageDialog=yes
+LanguageDetectionMethod=uilanguage
+
+[Languages]
+Name: en; MessagesFile: compiler:Default.isl
+Name: eu; MessagesFile: compiler:Languages\Basque.isl
+Name: br; MessagesFile: compiler:Languages\BrazilianPortuguese.isl
+Name: ca; MessagesFile: compiler:Languages\Catalan.isl
+Name: cz; MessagesFile: compiler:Languages\Czech.isl
+Name: da; MessagesFile: compiler:Languages\Danish.isl
+Name: nl; MessagesFile: compiler:Languages\Dutch.isl
+Name: fi; MessagesFile: compiler:Languages\Finnish.isl
+Name: fr; MessagesFile: compiler:Languages\French.isl
+Name: de; MessagesFile: compiler:Languages\German.isl
+Name: he; MessagesFile: compiler:Languages\Hebrew.isl
+Name: hu; MessagesFile: compiler:Languages\Hungarian.isl
+Name: it; MessagesFile: compiler:Languages\Italian.isl
+Name: ja; MessagesFile: compiler:Languages\Japanese.isl
+Name: nb; MessagesFile: compiler:Languages\Norwegian.isl
+Name: pl; MessagesFile: compiler:Languages\Polish.isl
+Name: pt; MessagesFile: compiler:Languages\Portuguese.isl
+Name: ru; MessagesFile: compiler:Languages\Russian.isl
+Name: sk; MessagesFile: compiler:Languages\Slovak.isl
+Name: sl; MessagesFile: compiler:Languages\Slovenian.isl
+Name: es; MessagesFile: compiler:Languages\Spanish.isl
+
+[Icons]
+Name: {group}\{cm:UninstallProgram, ScummVM}; Filename: {uninstallexe}
+Name: {group}\ScummVM; Filename: {app}\scummvm.exe; WorkingDir: {app}; Comment: scummvm; Flags: createonlyiffileexists; IconIndex: 0
+Name: {group}\Authors; Filename: {app}\AUTHORS.txt; WorkingDir: {app}; Comment: AUTHORS; Flags: createonlyiffileexists
+Name: {group}\Copying; Filename: {app}\COPYING.txt; WorkingDir: {app}; Comment: COPYING; Flags: createonlyiffileexists
+Name: {group}\Copying.LGPL; Filename: {app}\COPYING.LGPL.txt; WorkingDir: {app}; Comment: COPYING.LGPL; Flags: createonlyiffileexists
+Name: {group}\Copyright; Filename: {app}\COPYRIGHT.txt; WorkingDir: {app}; Comment: COPYRIGHT; Flags: createonlyiffileexists
+Name: {group}\Readme; Filename: {app}\README.txt; WorkingDir: {app}; Comment: README; Flags: createonlyiffileexists
+Name: {group}\News; Filename: {app}\NEWS.txt; WorkingDir: {app}; Comment: NEWS; Flags: createonlyiffileexists
+
+[Run]
+Filename: {app}\scummvm.exe; Flags: nowait skipifdoesntexist postinstall skipifsilent; Description: Launch ScummVM
+
+[UninstallDelete]
+Type: files; Name: {app}\ISTool.url
+
+[Files]
+Source: AUTHORS.txt; DestDir: {app}; Flags: ignoreversion
+Source: COPYING.txt; DestDir: {app}; Flags: ignoreversion
+Source: COPYING.LGPL.txt; DestDir: {app}; Flags: ignoreversion
+Source: COPYRIGHT.txt; DestDir: {app}; Flags: ignoreversion
+Source: NEWS.txt; DestDir: {app}; Flags: ignoreversion
+Source: README.txt; DestDir: {app}; Flags: ignoreversion isreadme
+Source: README-SDL.txt; DestDir: {app}; Flags: ignoreversion
+Source: scummvm.exe; DestDir: {app}; Flags: ignoreversion
+Source: SDL.dll; DestDir: {app}
+Source: scummclassic.zip; DestDir: {app}; Flags: ignoreversion
+Source: scummmodern.zip; DestDir: {app}; Flags: ignoreversion
+Source: drascula.dat; DestDir: {app}; Flags: ignoreversion
+Source: hugo.dat; DestDir: {app}; Flags: ignoreversion
+Source: kyra.dat; DestDir: {app}; Flags: ignoreversion
+Source: lure.dat; DestDir: {app}; Flags: ignoreversion
+Source: m4.dat; DestDir: {app}; Flags: ignoreversion
+Source: pred.dic; DestDir: {app}; Flags: ignoreversion
+Source: queen.tbl; DestDir: {app}; Flags: ignoreversion
+Source: sky.cpt; DestDir: {app}; Flags: ignoreversion
+Source: teenagent.dat; DestDir: {app}; Flags: ignoreversion
+Source: toon.dat; DestDir: {app}; Flags: ignoreversion
+Source: translations.dat; DestDir: {app}; Flags: ignoreversion