4 files changed, 72 insertions, 41 deletions
diff --git a/backends/platform/wince/Makefile b/backends/platform/wince/Makefile
index a9741f396f..7f8d45b3de 100644
--- a/backends/platform/wince/Makefile
+++ b/backends/platform/wince/Makefile
@@ -47,7 +47,6 @@ ENABLE_MADE = STATIC_PLUGIN
 ## Pick which libraries you want to use here
 
 USE_MAD           = 1
-#USE_MPEG2         = 1
 #USE_TREMOR        = 1
 USE_TREMOLO       = 1
 #USE_FLAC          = 1
@@ -133,11 +132,6 @@ DEFINES += -DUSE_MAD
 LIBS += -lmad
 endif
 
-ifdef USE_MPEG2
-DEFINES += -DUSE_MPEG2
-LIBS += -lmpeg2
-endif
-
 ifdef USE_TREMOR
 DEFINES += -DUSE_TREMOR -DUSE_VORBIS
 LIBS += -ltremorce
diff --git a/backends/platform/wince/README-WinCE.txt b/backends/platform/wince/README-WinCE.txt
index 69abd66e69..c48d9ca998 100644
--- a/backends/platform/wince/README-WinCE.txt
+++ b/backends/platform/wince/README-WinCE.txt
@@ -1,15 +1,49 @@
 ScummVM Windows CE FAQ
-Last updated: $Date$
-Release version: 1.1.0
+Last updated: 2011-05-27
+Release version: 1.3.0
 ------------------------------------------------------------------------
 
 New in this version
 -------------------
 
-1.1.1
+1.3.0:
+This is the first official Windows CE release since 1.1.1.
+
+The following new engines are now included (changes since last WinCE release):
+ - Draci Engine (Dragon History)
+ - Hugo Engine (Hugo Trilogy)
+ - Mohawk Engine (Myst, Riven, Living Book games & Where in Time is Carmen
+   Sandiego?)
+ - SCI Engine (Sierra SCI games, see main README for a list of supported games)
+ - Toon Engine (Toonstruck)
+
+Also, there are now 4 binaries in this distribution, a single executable
+which contains all engines (for devices with enough memory) and 3 smaller
+binaries which contain only some of the engines. The following lists all
+executables and the engines they contain:
+
+scummvm.exe:
+ - all supported engines
+scummvm1.exe:
+ - scumm, agi, cruise, draci, lure, queen, sky, sword1, tinsel, touche
+scummvm2.exe:
+ - agos, cine, drascula, gob, groovie, kyra, made, parallaction, saga,
+   teenagent, tucker
+scummvm3.exe:
+ - hugo, mohawk, sci, sword2, toon
+
+There are no other port specific changes.
+
+1.2.1:
+(Note: No official 1.2.1 release)
+
+1.2.0:
+(Note: No official 1.2.0 release)
+
+1.1.1:
 Fix to the Normal2xAspect scaler that was causing crashes.
 
-1.1.0
+1.1.0:
 The TeenAgent engine is now included, but there are no other port specific
 changes since 1.0.0.
 
diff --git a/backends/platform/wince/missing/io.h b/backends/platform/wince/missing/io.h
index 96bc6a9ea1..de492cac68 100644
--- a/backends/platform/wince/missing/io.h
+++ b/backends/platform/wince/missing/io.h
@@ -1,7 +1,6 @@
 /* Header is not present in Windows CE SDK */
 
 /* This stuff will live here until port configuration file is in place */
-#define stricmp _stricmp
 #define strdup _strdup
 
 #ifndef _FILE_DEFINED
diff --git a/backends/platform/wince/portdefs.h b/backends/platform/wince/portdefs.h
index 1f8b9bb3ca..93df6cd39e 100644
--- a/backends/platform/wince/portdefs.h
+++ b/backends/platform/wince/portdefs.h
@@ -20,44 +20,47 @@
  *
  */
 
-// Missing string/stdlib/assert declarations for WinCE 2.xx
+#ifndef WINCE_PORTDEFS_H
+#define WINCE_PORTDEFS_H
+
+#ifndef _WIN32_WCE
+#error For use on WinCE only
+#endif
 
+// Missing string/stdlib/assert declarations for WinCE 2.xx
 #if _WIN32_WCE < 300
 
-void *calloc(size_t n, size_t s);
-int isalnum(int c);
-int isdigit(int c);
-int isprint(int c);
-int isspace(int c);
-char *strrchr(const char *s, int c);
-char *strdup(const char *s);
-int _stricmp(const char *string1, const char *string2);
-int stricmp(const char *string1, const char *string2);
-void assert(void *expression);
-void assert(int expression);
-long int strtol(const char *nptr, char **endptr, int base);
-char *_strdup(const char *s);
-char *strpbrk(const char *s, const char *accept);
+	#define SMALL_SCREEN_DEVICE
+
+	void *calloc(size_t n, size_t s);
+	int isalnum(int c);
+	int isdigit(int c);
+	int isprint(int c);
+	int isspace(int c);
+	char *strrchr(const char *s, int c);
+	char *strdup(const char *s);
+	void assert(void *expression);
+	void assert(int expression);
+	long int strtol(const char *nptr, char **endptr, int base);
+	char *_strdup(const char *s);
+	char *strpbrk(const char *s, const char *accept);
 
 #endif
 
-#ifdef _WIN32_WCE
 
 #ifndef __GNUC__
-void *bsearch(const void *, const void *, size_t, size_t, int (*x)(const void *, const void *));
-char *getcwd(char *buf, int size);
-typedef int ptrdiff_t;
-void GetCurrentDirectory(int len, char *buf);
-#define INVALID_FILE_ATTRIBUTES 0xffffffff
+	void *bsearch(const void *, const void *, size_t, size_t, int (*x)(const void *, const void *));
+	char *getcwd(char *buf, int size);
+	typedef int ptrdiff_t;
+	void GetCurrentDirectory(int len, char *buf);
+	#define INVALID_FILE_ATTRIBUTES 0xffffffff
 #else
-#include <math.h>
-#undef GetCurrentDirectory
-extern "C" void GetCurrentDirectory(int len, char *buf);
-#define stricmp _stricmp
-#define strnicmp _strnicmp
-#define snprintf _snprintf
-#define strdup _strdup
-#define fopen wce_fopen
+	#include <math.h>
+	#undef GetCurrentDirectory
+	extern "C" void GetCurrentDirectory(int len, char *buf);
+	#define snprintf _snprintf
+	#define strdup _strdup
+	#define fopen wce_fopen
 #endif
 
 #include <windows.h>
@@ -72,7 +75,7 @@ extern "C" void GetCurrentDirectory(int len, char *buf);
 //#include <direct.h>
 
 #ifdef __MINGW32CE__
-void *bsearch(const void *, const void *, size_t, size_t, int (*x)(const void *, const void *));
+	void *bsearch(const void *, const void *, size_t, size_t, int (*x)(const void *, const void *));
 #endif
 int remove(const char *path);
 int _access(const char *path, int mode);
@@ -81,4 +84,5 @@ void drawError(char *);
 
 #define vsnprintf _vsnprintf
 
+
 #endif