Merge remote branch 'upstream/master' into pegasus

.gitignore

@@ -19,8 +19,10 @@ lib*.a
 /MT32_CONTROL.ROM
 /MT32_PCM.ROM
 /ScummVM.app
+/*.ipk
 /.project
 /.cproject
+/.settings
 
 /backends/platform/dc/gui
 /backends/platform/dc/graphics
@@ -62,21 +64,21 @@ lib*.a
 
 /dists/rpl.exe
 
+/dists/codeblocks/*.cbp
+/dists/codeblocks/*.depend
+/dists/codeblocks/*.layout
+/dists/codeblocks/scummvm*
+
 /dists/iphone/build
 /dists/iphone/scummvm.xcodeproj/*.mode1v3
 /dists/iphone/scummvm.xcodeproj/*.pbxuser
 
-/dists/msvc8/[Dd]ebug*/
-/dists/msvc8/[Rr]elease*/
-/dists/msvc8/*.lib
-
-/dists/msvc9/[Dd]ebug*/
-/dists/msvc9/[Rr]elease*/
-/dists/msvc9/*.lib
-
-/dists/msvc10/[Dd]ebug*/
-/dists/msvc10/[Rr]elease*/
-/dists/msvc10/*.lib
+/dists/msvc*/[Dd]ebug*/
+/dists/msvc*/[Rr]elease*/
+/dists/msvc*/*.lib
+/dists/msvc*/*.SAV
+/dists/msvc*/*.dat
+/dists/msvc*/*.dll
 
 /doc/*.aux
 /doc/*.dvi
@@ -86,24 +88,26 @@ lib*.a
 /doc/*.ps
 /doc/*.toc
 
+/plugins
+
 /test/runner
 /test/runner.cpp
 /test/*.dSYM
 
-/tools/convbdf
-/tools/md5table
-/tools/make-scumm-fontdata
-/tools/create_drascula/create_drascula
-/tools/create_hugo/create_hugo
-/tools/create_kyradat/create_kyradat
-/tools/create_lure/create_lure
-/tools/create_mads/create_mads
-/tools/create_project/create_project
-/tools/create_teenagent/create_teenagent
-/tools/create_toon/create_toon
-/tools/create_translations/create_translations
-/tools/qtable/qtable
-/tools/skycpt/skycpt
+/devtools/convbdf
+/devtools/md5table
+/devtools/make-scumm-fontdata
+/devtools/create_drascula/create_drascula
+/devtools/create_hugo/create_hugo
+/devtools/create_kyradat/create_kyradat
+/devtools/create_lure/create_lure
+/devtools/create_mads/create_mads
+/devtools/create_project/create_project
+/devtools/create_teenagent/create_teenagent
+/devtools/create_toon/create_toon
+/devtools/create_translations/create_translations
+/devtools/qtable/qtable
+/devtools/skycpt/skycpt
 
 #ignore thumbnails created by windows
 Thumbs.db

AUTHORS

@@ -137,8 +137,10 @@ ScummVM Team
        Filippos Karapetis
 
     Mohawk:
+       Bastien Bouclet
        Matthew Hoops
        Filippos Karapetis
+       Alyssa Milburn
        Eugene Sandulenko
        David Turner
 
@@ -181,12 +183,17 @@ ScummVM Team
     Touche:
        Gregory Montoir
 
+    TsAGE:
+       Paul Gilbert
+       Arnaud Boutonne
+
     Tucker:
        Gregory Montoir
 
   Backend Teams
   -------------
     Android:
+       Andre Heider
        Angus Lees
 
     Dreamcast:
@@ -233,6 +240,9 @@ ScummVM Team
        Jurgen Braam
        Lars Persson
 
+    WebOS:
+       Klaus Reimer
+
     Wii:
        Andre Heider
 
@@ -252,7 +262,7 @@ ScummVM Team
     Miscellaneous:
        David Corrales-Lopez  - Filesystem access improvements (GSoC 2007
                                task) (retired)
-       Jerome Fisher         - MT-32 emulator (retired)
+       Jerome Fisher         - MT-32 emulator
        Benjamin Haisch       - Heavily improved de-/encoder for DXA videos
        Jochen Hoenicke       - Speaker & PCjr sound support, AdLib work
                                (retired)
@@ -265,6 +275,18 @@ ScummVM Team
   --------------
      Fredrik Wendel        - (retired)
 
+  Website (maintenance)
+  ---------------------
+     James Brown           - IRC Logs maintainer
+     Thierry Crozat        - Wiki maintainer
+     Andre Heider          - Buildbot maintainer
+     Max Horn              - Forum, IRC channel and Mailing list maintainer
+     Joost Peters          - Doxygen Project Documentation maintainer
+     Jordi Vilalta Prat    - Wiki maintainer
+     Eugene Sandulenko     - Forum, IRC channel, Screen Shots and Mailing
+                             list maintainer
+     John Willis
+
   Website (content)
   -----------------
      All active team members
@@ -386,6 +408,9 @@ Other contributions
     Spanish:
        Tomas Maidagan
 
+    Swedish:
+       Hampus Flink
+
     Ukrainian:
        Lubomyr Lisen
 
@@ -396,6 +421,7 @@ Other contributions
      David Jensen          - SVG logo conversion
      Jean Marc Gimenez     - ScummVM logo
      Raina                 - ScummVM forum buttons
+     William Claydon       - Skins for doxygen, buildbot and wiki
 
   Code contributions
   ------------------
@@ -405,7 +431,7 @@ Other contributions
                              engine)
      Paolo Costabel        - PSP port contributions
      Martin Doucha         - CinE engine objectification
-     Thomas Fach-Pedersen  - ProTracker module player
+     Thomas Fach-Pedersen  - ProTracker module player, Smacker video decoder
      Tobias Gunkel         - Sound support for C64 version of MM/Zak, Loom
                              PCE support
      Janne Huttunen        - V3 actor mask support, Dig/FT SMUSH audio
@@ -533,7 +559,7 @@ Special thanks to
    Drascula: The Vampire Strikes Back with us and his generosity with
    freewaring the game.
 
-   David P. Gray from Gray Design Associate for sharing the source code of
+   David P. Gray from Gray Design Associates for sharing the source code of
    the Hugo trilogy.
 
    Broken Sword 2.5 team for providing sources of their engine and their

COPYRIGHT

@@ -10,6 +10,7 @@ Chris Apers
 Ori Avtalion
 Nicolas Bacca
 Fabio Battaglia
+Bastien Bouclet
 Arnaud Boutonne
 Jurgen Braam
 Ralph Brorsen
@@ -51,6 +52,7 @@ Andrew Kurushin
 Angus Lees
 Claudio Matsuoka
 Thomas Mayer
+Alyssa Milburn
 Neil Millstone
 Gregory Montoir
 Kostas Nakos
@@ -86,7 +88,6 @@ Bodo Bellut "bellut"
 Bramvandijk "bramvandijk"
 Andreas Bierfert "awjb"
 Elio Blanca "eblanca76"
-Bastien Bouclet "bgk"
 David Breakey "dbreakey"
 Robert Buchholz "prendi"
 Rainer Canavan "canavan"
@@ -154,7 +155,6 @@ Vladimir Menshakov "megath"
 Adam Metcalf "gamblore"
 Frank Meyering "frank_m24"
 Gael Le Migno "kilobug"
-Alyssa Anne Milburn "fuzzie"
 Andy Molloy "maloi"
 Sean Murrau "lightcast"
 Armin Mueller "arm_in"

Makefile

@@ -26,7 +26,7 @@ ifeq "$(HAVE_GCC)" "1"
 	CXXFLAGS+= -Wno-long-long -Wno-multichar -Wno-unknown-pragmas -Wno-reorder
 	# Enable even more warnings...
 	CXXFLAGS+= -Wpointer-arith -Wcast-qual
-	CXXFLAGS+= -Wshadow -Wimplicit -Wnon-virtual-dtor -Wwrite-strings
+	CXXFLAGS+= -Wshadow -Wnon-virtual-dtor -Wwrite-strings
 
 	# Currently we disable this gcc flag, since it will also warn in cases,
 	# where using GCC_PRINTF (means: __attribute__((format(printf, x, y))))
@@ -55,10 +55,6 @@ ifeq "$(HAVE_ICC)" "1"
 	CXXFLAGS+= -diag-disable 161,1899
 endif
 
-# Warn if global constructors are used. Only available in GCC with LLVM backend
-# (and maybe clang?), hence off by default.
-#CXXFLAGS+= -Wglobal-constructors
-
 #######################################################################
 # Default commands - put the necessary replacements in config.mk      #
 #######################################################################

Makefile.common

@@ -16,7 +16,7 @@ all: $(EXECUTABLE) plugins
 ######################################################################
 
 PLUGINS :=
-MODULES := test tools base $(MODULES)
+MODULES := test devtools base $(MODULES)
 
 -include $(srcdir)/engines/engines.mk
 
@@ -154,8 +154,7 @@ endif
 # Get the current version information
 ######################################################################
 
-# AmigaOS4's grep has a problem with "./" in pathnames, so use cat.
-VERSION = $(shell cat "${srcdir}/base/internal_version.h" | grep SCUMMVM_VERSION | cut -d\" -f2)
+VERSION = $(shell grep SCUMMVM_VERSION "${srcdir}/base/internal_version.h" | cut -d\" -f2)
 VER_MAJOR = $(shell echo $(VERSION) | cut -d. -f 1)
 VER_MINOR = $(shell echo $(VERSION) | cut -d. -f 2)
 VER_PATCH = $(shell echo $(VERSION) | cut -d. -f 3 | cut -c1)