6 files changed, 23 insertions, 12 deletions
diff --git a/backends/platform/dc/dc.h b/backends/platform/dc/dc.h
index b567142b8f..6cd938ec9c 100644
--- a/backends/platform/dc/dc.h
+++ b/backends/platform/dc/dc.h
@@ -63,7 +63,7 @@ public:
 	bool isPlaying() const;
 
 	// Play cdrom audio track
-	void play(int track, int numLoops, int startFrame, int duration, bool onlyEmulate = false);
+	bool play(int track, int numLoops, int startFrame, int duration, bool onlyEmulate = false);
 
 	// Stop cdrom audio track
 	void stop();
diff --git a/backends/platform/dc/dcmain.cpp b/backends/platform/dc/dcmain.cpp
index bd66b81b35..c84aef9c47 100644
--- a/backends/platform/dc/dcmain.cpp
+++ b/backends/platform/dc/dcmain.cpp
@@ -90,12 +90,18 @@ static bool find_track(int track, int &first_sec, int &last_sec)
   return false;
 }
 
-void DCCDManager::play(int track, int numLoops, int startFrame, int duration, bool onlyEmulate) {
+bool DCCDManager::play(int track, int numLoops, int startFrame, int duration, bool onlyEmulate) {
 	DefaultAudioCDManager::play(track, numLoops, startFrame, duration, onlyEmulate);
 
-	// If we're playing now, are set to only emulate, return here
-	if (isPlaying() || onlyEmulate)
-		return;
+	// If we're playing now return here
+	if (isPlaying()) {
+		return true;
+	}
+
+	// If we should only play emulated tracks stop here.
+	if (onlyEmulate) {
+		return false;
+	}
 
 	int firstSec, lastSec;
 #if 1
@@ -106,16 +112,18 @@ void DCCDManager::play(int track, int numLoops, int startFrame, int duration, bo
 	if (numLoops > 14)
 		numLoops = 14;
 	else if (numLoops < 0)
-		num_loops = 15; // infinity
+		numLoops = 15; // infinity
 
 	if (!find_track(track, firstSec, lastSec))
-		return;
+		return false;
 
 	if (duration)
 		lastSec = firstSec + startFrame + duration;
 
- 	firstSec += startFrame;
+	firstSec += startFrame;
 	play_cdda_sectors(firstSec, lastSec, numLoops);
+
+	return true;
 }
 
 void DCCDManager::stop() {
diff --git a/backends/platform/dingux/build.gcw0.sh b/backends/platform/dingux/build.gcw0.sh
index c1a4fa29c2..7a31d4fd27 100755
--- a/backends/platform/dingux/build.gcw0.sh
+++ b/backends/platform/dingux/build.gcw0.sh
@@ -3,4 +3,4 @@
 export PATH=/opt/gcw0-toolchain/usr/bin:$PATH
 
 # Disable high resolution engines since we have 320x240 hardware
-./configure --host=gcw0 --enable-plugins --default-dynamic --enable-release  --disable-mt32emu --disable-hq-scalers && make -j6 gcw-opk && ls -l scummvm.opk
+./configure --host=gcw0 --enable-plugins --default-dynamic --enable-release && make -j6 gcw-opk && ls -l scummvm.opk
diff --git a/backends/platform/dingux/dingux.mk b/backends/platform/dingux/dingux.mk
index 56c26c3be1..b7f700d7fd 100644
--- a/backends/platform/dingux/dingux.mk
+++ b/backends/platform/dingux/dingux.mk
@@ -59,7 +59,8 @@ endif
 	echo >> $(gcw0_bundle)/README.man.txt
 	echo '[General README]' >> $(gcw0_bundle)/README.man.txt
 	echo >> $(gcw0_bundle)/README.man.txt
-	cat README >> $(gcw0_bundle)/README.man.txt
+	cat README | sed -e 's/\[/⟦/g' -e 's/\]/⟧/g' -e '/^1\.1)/,$$ s/^[0-9][0-9]*\.[0-9][0-9]*.*/\[&\]/' >> $(gcw0_bundle)/README.man.txt
+
 
 #	$(CP) GeneralUser\ GS\ FluidSynth\ v1.44.sf2 $(gcw0_bundle)/
 
diff --git a/backends/platform/symbian/src/portdefs.h b/backends/platform/symbian/src/portdefs.h
index f9da09d3eb..e2465e4767 100644
--- a/backends/platform/symbian/src/portdefs.h
+++ b/backends/platform/symbian/src/portdefs.h
@@ -65,7 +65,8 @@ typedef signed long int int32;
 #undef remove
 #endif
 
-#define SMALL_SCREEN_DEVICE
+#define GUI_ONLY_FULLSCREEN
+#define GUI_ENABLE_KEYSDIALOG
 
 #define DISABLE_COMMAND_LINE
 #define USE_RGB_COLOR
diff --git a/backends/platform/wince/portdefs.h b/backends/platform/wince/portdefs.h
index 3304ee0893..c74fc39169 100644
--- a/backends/platform/wince/portdefs.h
+++ b/backends/platform/wince/portdefs.h
@@ -30,7 +30,8 @@
 // Missing string/stdlib/assert declarations for WinCE 2.xx
 #if _WIN32_WCE < 300
 
-	#define SMALL_SCREEN_DEVICE
+	#define GUI_ONLY_FULLSCREEN
+	#define GUI_ENABLE_KEYSDIALOG
 
 	void *calloc(size_t n, size_t s);
 	int isalnum(int c);