Merge branch 'branch-1-3-0' into master

I manually resolved all conflicts, and inspected every single change.
Many were due to the version string mismatch and thus easily resolved.
The MSVC project files add in the 1-3-0 branch were not merged,
neither where the changes to gui/themes/translations.dat.

Conflicts:
	NEWS
	backends/base-backend.cpp
	backends/graphics/samsungtvsdl/samsungtvsdl-graphics.cpp
	backends/module.mk
	backends/platform/ds/arm9/makefile
	backends/platform/psp/README.PSP
	backends/platform/samsungtv/main.cpp
	backends/platform/samsungtv/samsungtv.cpp
	backends/saves/posix/posix-saves.cpp
	base/commandLine.cpp
	base/internal_version.h
	base/main.cpp
	common/array.h
	configure
	devtools/create_project/create_project.cpp
	dists/android/AndroidManifest.xml
	dists/android/plugin-manifest.xml
	dists/iphone/Info.plist
	dists/irix/scummvm.spec
	dists/macosx/Info.plist
	dists/redhat/scummvm-tools.spec
	dists/redhat/scummvm.spec
	dists/scummvm.rc
	dists/slackware/scummvm.SlackBuild
	dists/wii/meta.xml
	engines/sci/parser/vocabulary.cpp
	engines/tinsel/handle.cpp
	gui/themes/translations.dat

2 files changed, 93 insertions, 65 deletions

diff --git a/backends/platform/ps2/Makefile.gdb b/backends/platform/ps2/Makefile.gdb
index 48dcebc1d4..1009f0fe4e 100644
--- a/backends/platform/ps2/Makefile.gdb
+++ b/backends/platform/ps2/Makefile.gdb
@@ -1,7 +1,7 @@
 # $Header: Exp $
  include $(PS2SDK)/Defs.make
 
-PS2_EXTRA = /media/disk/nw8240/extras/scummvm/ports
+PS2_EXTRA = /works/devel/ps2/sdk-extra
 PS2_EXTRA_INCS = /zlib/include /libmad/ee/include /SjPcm/ee/src /tremor
 PS2_EXTRA_LIBS = /zlib/lib /libmad/ee/lib /SjPcm/ee/lib /tremor/tremor
 
@@ -9,31 +9,44 @@ ENABLED=STATIC_PLUGIN
 
 ENABLE_SCUMM = $(ENABLED)
 ENABLE_SCUMM_7_8 = $(ENABLED)
-#ENABLE_HE = $(ENABLED)
-#ENABLE_AGI = $(ENABLED)
-#ENABLE_AGOS = $(ENABLED)
-#ENABLE_CINE = $(ENABLED)
-#ENABLE_CRUISE = $(ENABLED)
-#ENABLE_DRASCULA = $(ENABLED)
-#ENABLE_GOB = $(ENABLED)
-#ENABLE_KYRA = $(ENABLED)
-#ENABLE_LURE = $(ENABLED)
- # ENABLE_M4 = $(ENABLED)
-#ENABLE_MADE = $(ENABLED)
-#ENABLE_PARALLACTION = $(ENABLED)
-#ENABLE_QUEEN = $(ENABLED)
-#ENABLE_SAGA = $(ENABLED)
-#ENABLE_SAGA2 = $(ENABLED)
-#ENABLE_IHNM = $(ENABLED)
-#ENABLE_SKY = $(ENABLED)
-#ENABLE_SWORD1 = $(ENABLED)
-#ENABLE_SWORD2 = $(ENABLED)
- # ENABLE_TINSEL = $(ENABLED)
-#ENABLE_TOUCHE = $(ENABLED)
+# ENABLE_HE = $(ENABLED)
+# ENABLE_AGI = $(ENABLED)
+# ENABLE_AGOS = $(ENABLED)
+# ENABLE_AGOS2 = $(ENABLED)
+# ENABLE_CINE = $(ENABLED)
+# ENABLE_CRUISE = $(ENABLED)
+# ENABLE_DRACI = $(ENABLED)
+# ENABLE_DRASCULA = $(ENABLED)
+# ENABLE_GOB = $(ENABLED)
+# ENABLE_GROOVIE = $(ENABLED)
+## ENABLE_GROOVIE2 = $(ENABLED)
+# ENABLE_HUGO = $(ENABLED)
+# ENABLE_IHNM = $(ENABLED)
+# ENABLE_KYRA = $(ENABLED)
+## ENABLE_LOL = $(ENABLED)
+# ENABLE_LURE = $(ENABLED)
+## ENABLE_M4 = $(ENABLED)
+# ENABLE_MADE = $(ENABLED)
+# ENABLE_MOHAWK = $(ENABLED)
+# ENABLE_PARALLACTION = $(ENABLED)
+# ENABLE_QUEEN = $(ENABLED)
+# ENABLE_SAGA = $(ENABLED)
+# ENABLE_SAGA2 = $(ENABLED)
+# ENABLE_SCI = $(ENABLED)
+## ENABLE_SCI32 = $(ENABLED)
+# ENABLE_SKY = $(ENABLED)
+# ENABLE_SWORD1 = $(ENABLED)
+# ENABLE_SWORD2 = $(ENABLED)
+# ENABLE_TEENAGENT = $(ENABLED)
+# ENABLE_TINSEL = $(ENABLED)
+# ENABLE_TOON = $(ENABLED)
+# ENABLE_TOUCHE = $(ENABLED)
+# ENABLE_TUCKER = $(ENABLED)
+
 
 HAVE_GCC3 = true
 
-CC		= ee-gcc
+CC      = ee-gcc
 CXX     = ee-g++
 AS      = ee-gcc
 LD      = ee-gcc
@@ -48,35 +61,35 @@ VPATH = $(srcdir)
 INCDIR = ../../../
 # DEPDIR = .deps
 
-DEFINES  = -DUSE_VORBIS -DUSE_TREMOR -DUSE_MAD -DUSE_ZLIB -DFORCE_RTL -D_EE -D__PLAYSTATION2__ -D__PS2_DEBUG__ -g -Wall -Wno-multichar
-
+DEFINES  = -DUSE_VORBIS -DUSE_TREMOR -DUSE_MAD -DUSE_ZLIB -DFORCE_RTL -DDISABLE_SAVEGAME_SORTING -D_EE -D__PLAYSTATION2__ -D__PS2_DEBUG__ -g -Wall -Wno-multichar -fno-rtti -fno-exceptions # -DNO_ADAPTOR
+DEFINES += -DRELEASE_BUILD
 
 INCLUDES  = $(addprefix -I$(PS2_EXTRA),$(PS2_EXTRA_INCS))
 INCLUDES += -I $(PS2GDB)/ee -I $(PS2SDK)/ee/include -I $(PS2SDK)/common/include -I ./common -I . -I $(srcdir) -I $(srcdir)/engines
 
+CXX_UPDATE_DEP_FLAG = -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d",-MQ,"$@",-MP
+
 TARGET = elf/scummvm.elf
 
-OBJS := backends/platform/ps2/DmaPipe.o \
-    backends/platform/ps2/Gs2dScreen.o \
-    backends/platform/ps2/irxboot.o \
-	backends/platform/ps2/ps2input.o \
-	backends/platform/ps2/ps2pad.o \
-	backends/platform/ps2/savefilemgr.o \
-    backends/platform/ps2/fileio.o \
-    backends/platform/ps2/asyncfio.o \
-	backends/platform/ps2/icon.o \
-    backends/platform/ps2/cd.o \
-    backends/platform/ps2/eecodyvdfs.o \
-    backends/platform/ps2/rpckbd.o \
-    backends/platform/ps2/systemps2.o \
-    backends/platform/ps2/ps2mutex.o \
-    backends/platform/ps2/ps2time.o \
-	backends/platform/ps2/ps2debug.o
+OBJS := $(srcdir)/backends/platform/ps2/DmaPipe.o \
+	$(srcdir)/backends/platform/ps2/Gs2dScreen.o \
+	$(srcdir)/backends/platform/ps2/irxboot.o \
+	$(srcdir)/backends/platform/ps2/ps2input.o \
+	$(srcdir)/backends/platform/ps2/ps2pad.o \
+	$(srcdir)/backends/platform/ps2/savefilemgr.o \
+	$(srcdir)/backends/platform/ps2/fileio.o \
+	$(srcdir)/backends/platform/ps2/asyncfio.o \
+	$(srcdir)/backends/platform/ps2/icon.o \
+	$(srcdir)/backends/platform/ps2/cd.o \
+	$(srcdir)/backends/platform/ps2/eecodyvdfs.o \
+	$(srcdir)/backends/platform/ps2/rpckbd.o \
+	$(srcdir)/backends/platform/ps2/systemps2.o \
+	$(srcdir)/backends/platform/ps2/ps2mutex.o \
+	$(srcdir)/backends/platform/ps2/ps2time.o \
+	$(srcdir)/backends/platform/ps2/ps2debug.o
 
 MODULE_DIRS += .
 
-BACKEND := ps2
-
 include $(srcdir)/Makefile.common
 
 LDFLAGS += -mno-crt0 $(PS2SDK)/ee/startup/crt0.o -T $(PS2SDK)/ee/startup/linkfile
diff --git a/backends/platform/ps2/Makefile.ps2 b/backends/platform/ps2/Makefile.ps2
index 472ba5ec3a..ea966ec236 100644
--- a/backends/platform/ps2/Makefile.ps2
+++ b/backends/platform/ps2/Makefile.ps2
@@ -12,28 +12,41 @@ ENABLE_SCUMM_7_8 = $(ENABLED)
 ENABLE_HE = $(ENABLED)
 ENABLE_AGI = $(ENABLED)
 ENABLE_AGOS = $(ENABLED)
+ENABLE_AGOS2 = $(ENABLED)
 ENABLE_CINE = $(ENABLED)
 ENABLE_CRUISE = $(ENABLED)
+ENABLE_DRACI = $(ENABLED)
 ENABLE_DRASCULA = $(ENABLED)
 ENABLE_GOB = $(ENABLED)
+ENABLE_GROOVIE = $(ENABLED)
+# ENABLE_GROOVIE2 = $(ENABLED)
+ENABLE_HUGO = $(ENABLED)
+ENABLE_IHNM = $(ENABLED)
 ENABLE_KYRA = $(ENABLED)
+# ENABLE_LOL = $(ENABLED)
 ENABLE_LURE = $(ENABLED)
 # ENABLE_M4 = $(ENABLED)
 ENABLE_MADE = $(ENABLED)
+ENABLE_MOHAWK = $(ENABLED)
 ENABLE_PARALLACTION = $(ENABLED)
 ENABLE_QUEEN = $(ENABLED)
 ENABLE_SAGA = $(ENABLED)
-ENABLE_SAGA2 = $(ENABLED)
-ENABLE_IHNM = $(ENABLED)
+# ENABLE_SAGA2 = $(ENABLED)
+ENABLE_SCI = $(ENABLED)
+# ENABLE_SCI32 = $(ENABLED)
 ENABLE_SKY = $(ENABLED)
 ENABLE_SWORD1 = $(ENABLED)
 ENABLE_SWORD2 = $(ENABLED)
-# ENABLE_TINSEL = $(ENABLED)
+ENABLE_TEENAGENT = $(ENABLED)
+ENABLE_TINSEL = $(ENABLED)
+ENABLE_TOON = $(ENABLED)
 ENABLE_TOUCHE = $(ENABLED)
+ENABLE_TUCKER = $(ENABLED)
+
 
 HAVE_GCC3 = true
 
-CC		= ee-gcc
+CC      = ee-gcc
 CXX     = ee-g++
 AS      = ee-gcc
 LD      = ee-gcc
@@ -48,30 +61,32 @@ VPATH = $(srcdir)
 INCDIR = ../../../
 # DEPDIR = .deps
 
-DEFINES  = -DUSE_VORBIS -DUSE_TREMOR -DUSE_MAD -DUSE_ZLIB -DFORCE_RTL -D_EE -D__PLAYSTATION2__ -O2 -Wall -Wno-multichar
-
+DEFINES  = -DUSE_VORBIS -DUSE_TREMOR -DUSE_MAD -DUSE_ZLIB -DFORCE_RTL -DDISABLE_SAVEGAME_SORTING -D_EE -D__PLAYSTATION2__ -G2 -O2 -Wall -Wno-multichar -fno-rtti -fno-exceptions # -DNO_ADAPTOR
+DEFINES += -DRELEASE_BUILD
 
 INCLUDES  = $(addprefix -I$(PS2_EXTRA),$(PS2_EXTRA_INCS))
 INCLUDES += -I $(PS2SDK)/ee/include -I $(PS2SDK)/common/include -I ./common -I . -I $(srcdir) -I $(srcdir)/engines
 
+CXX_UPDATE_DEP_FLAG = -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d",-MQ,"$@",-MP
+
 TARGET = elf/scummvm.elf
 
-OBJS := backends/platform/ps2/DmaPipe.o \
-    backends/platform/ps2/Gs2dScreen.o \
-    backends/platform/ps2/irxboot.o \
-	backends/platform/ps2/ps2input.o \
-	backends/platform/ps2/ps2pad.o \
-	backends/platform/ps2/savefilemgr.o \
-    backends/platform/ps2/fileio.o \
-    backends/platform/ps2/asyncfio.o \
-	backends/platform/ps2/icon.o \
-    backends/platform/ps2/cd.o \
-    backends/platform/ps2/eecodyvdfs.o \
-    backends/platform/ps2/rpckbd.o \
-    backends/platform/ps2/systemps2.o \
-    backends/platform/ps2/ps2mutex.o \
-    backends/platform/ps2/ps2time.o \
-	backends/platform/ps2/ps2debug.o
+OBJS := $(srcdir)/backends/platform/ps2/DmaPipe.o \
+	$(srcdir)/backends/platform/ps2/Gs2dScreen.o \
+	$(srcdir)/backends/platform/ps2/irxboot.o \
+	$(srcdir)/backends/platform/ps2/ps2input.o \
+	$(srcdir)/backends/platform/ps2/ps2pad.o \
+	$(srcdir)/backends/platform/ps2/savefilemgr.o \
+	$(srcdir)/backends/platform/ps2/fileio.o \
+	$(srcdir)/backends/platform/ps2/asyncfio.o \
+	$(srcdir)/backends/platform/ps2/icon.o \
+	$(srcdir)/backends/platform/ps2/cd.o \
+	$(srcdir)/backends/platform/ps2/eecodyvdfs.o \
+	$(srcdir)/backends/platform/ps2/rpckbd.o \
+	$(srcdir)/backends/platform/ps2/systemps2.o \
+	$(srcdir)/backends/platform/ps2/ps2mutex.o \
+	$(srcdir)/backends/platform/ps2/ps2time.o \
+	$(srcdir)/backends/platform/ps2/ps2debug.o
 
 MODULE_DIRS += .