Merged revisions 32507-32513,32516,32518,32520-32521,32523-32524,32526-32548,32550-32562 via svnmerge from

https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

svn-id: r32563

7 files changed, 76 insertions, 28 deletions

diff --git a/dists/msvc7/cruise.vcproj b/dists/msvc7/cruise.vcproj
index d34f910c0d..bac134e02c 100644
--- a/dists/msvc7/cruise.vcproj
+++ b/dists/msvc7/cruise.vcproj
@@ -244,12 +244,6 @@
 			RelativePath="..\..\engines\cruise\stack.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\cruise\stringSupport.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\stringSupport.h">
-		</File>
-		<File
 			RelativePath="..\..\engines\cruise\various.cpp">
 		</File>
 		<File
diff --git a/dists/msvc71/cruise.vcproj b/dists/msvc71/cruise.vcproj
index 1915be0c5d..53ed72f60e 100644
--- a/dists/msvc71/cruise.vcproj
+++ b/dists/msvc71/cruise.vcproj
@@ -258,12 +258,6 @@
 			RelativePath="..\..\engines\cruise\stack.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\cruise\stringSupport.cpp">
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\stringSupport.h">
-		</File>
-		<File
 			RelativePath="..\..\engines\cruise\various.cpp">
 		</File>
 		<File
diff --git a/dists/msvc8/cruise.vcproj b/dists/msvc8/cruise.vcproj
index 45479ef22f..f183d07ee3 100644
--- a/dists/msvc8/cruise.vcproj
+++ b/dists/msvc8/cruise.vcproj
@@ -357,14 +357,6 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\cruise\stringSupport.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\stringSupport.h"
-			>
-		</File>
-		<File
 			RelativePath="..\..\engines\cruise\various.cpp"
 			>
 		</File>
diff --git a/dists/msvc9/cruise.vcproj b/dists/msvc9/cruise.vcproj
index 2d47ab4d2c..19a96eb7be 100644
--- a/dists/msvc9/cruise.vcproj
+++ b/dists/msvc9/cruise.vcproj
@@ -358,14 +358,6 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\cruise\stringSupport.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\cruise\stringSupport.h"
-			>
-		</File>
-		<File
 			RelativePath="..\..\engines\cruise\various.cpp"
 			>
 		</File>
diff --git a/dists/wii/READMII b/dists/wii/READMII
new file mode 100644
index 0000000000..4f157dffe7
--- /dev/null
+++ b/dists/wii/READMII
@@ -0,0 +1,64 @@
+Wii port of ScummVM README
+--------------------------
+
+features not compiled in:
+- the AGI game engine
+
+REQUIREMENTS
+
+  - sd card
+  - wiimote or gamecube controller in port 1
+
+INSTALL
+
+  - copy the "apps" folder to the root of your sd card
+  - copy your demos and/or games onto the same sd card
+    each game goes into its own subdirectory, do not place those under
+    "/apps/scummvm", and do not set the "theme" or "extra" path to that folder
+    freeware versions: http://scummvm.org/downloads.php#extras
+    demos: http://scummvm.org/demos.php
+
+RUN
+
+  either use the homebrew channel, available at
+
+  http://hbc.hackmii.com/
+
+  or load "boot.dol" with your favorite loader
+
+CONTROLS
+
+  wiimote
+
+    analog stick: mouse movement
+    a: left mouse button
+    b: right mouse button
+    minus: escape
+    plus: "." (skip current line of text)
+    2: enter
+    home: f5 (scummvm menu)
+    dpad up: shift (mass add for the gui)
+    dpad down: "0"
+    dpad left: "y"
+    dpad right: "n"
+
+  gamecube pad
+
+    analog stick: mouse movement
+    a: left mouse button
+    b: right mouse button
+    x: escape
+    y: "." (skip current line of text)
+    z: enter
+    start: f5 (scummvm menu)
+    dpad up: shift (mass add for the gui)
+    dpad down: "0"
+    dpad left: "y"
+    dpad right: "n"
+
+THANKS
+
+  shagkur and WinterMute, for devkitppc/libogc and the coorperation
+  svpe, for fixing the libfat feof/thread bugs on the last minute
+  para, for making wiiuse available in libogc
+
diff --git a/dists/wii/icon.png b/dists/wii/icon.png
new file mode 100644
index 0000000000..dc873e66f2
--- /dev/null
+++ b/dists/wii/icon.png
diff --git a/dists/wii/meta.xml b/dists/wii/meta.xml
new file mode 100644
index 0000000000..fb53474052
--- /dev/null
+++ b/dists/wii/meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<app version="1">
+  <name>ScummVM</name>
+  <coder>The ScummVM Team</coder>
+  <version>rev FIXME</version>
+  <release_date>FIXME</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!
+
+Some of the adventures ScummVM supports include Adventure Soft's Simon the Sorcerer 1 and 2; Revolution's Beneath A Steel Sky, Broken Sword 1 and Broken Sword 2; Flight of the Amazon Queen; Wyrmkeep's Inherit the Earth; Coktel Vision's Gobliiins; Westwood Studios' The Legend of Kyrandia and games based on LucasArts' SCUMM (Script Creation Utility for Maniac Mansion) system such as Monkey Island, Day of the Tentacle, Sam and Max and more.</long_description>
+</app>
+