[Scummvm-cvs-logs] SF.net SVN: scummvm: [26690] scummvm/trunk/common

[chrilith at users.sourceforge.net]

Revision: 26690
          http://scummvm.svn.sourceforge.net/scummvm/?rev=26690&view=rev
Author:   chrilith
Date:     2007-05-01 02:37:40 -0700 (Tue, 01 May 2007)

Log Message:
-----------
Cleanup, remove PalmOS dependencies from the ScummVM core

Modified Paths:
--------------
    scummvm/trunk/common/scummsys.h
    scummvm/trunk/common/util.cpp

Modified: scummvm/trunk/common/scummsys.h
===================================================================
--- scummvm/trunk/common/scummsys.h	2007-05-01 09:34:53 UTC (rev 26689)
+++ scummvm/trunk/common/scummsys.h	2007-05-01 09:37:40 UTC (rev 26690)
@@ -203,27 +203,31 @@
 
 #elif defined(__PALMOS_TRAPS__)	|| defined (__PALMOS_ARMLET__)
 
-	#define scumm_stricmp stricmp
-	#define scumm_strnicmp strnicmp
+	#ifdef PALMOS_68K
+	#	include "globals.h"
+	#	define SCUMM_BIG_ENDIAN
 
-	#ifdef PALMOS_68K
-	#define SCUMM_BIG_ENDIAN
+	#	define scumm_stricmp StrCaselessCompare
+	#	define scumm_strnicmp StrNCaselessCompare
+
 	#else
-	#define SCUMM_LITTLE_ENDIAN
+
+	#	include <extras_string.h>
+	#	define SCUMM_LITTLE_ENDIAN
+
+	#	define scumm_stricmp stricmp
+	#	define scumm_strnicmp strnicmp
 	#endif
 
 	#define SCUMM_NEED_ALIGNMENT
-
-	#include "palmversion.h"
-	#include "globals.h"
-	#include "extend.h"
+	#define STRINGBUFLEN 256
 	
-	#define STRINGBUFLEN 256
+	extern const char *SCUMMVM_SAVEPATH;
 
 	#if !defined(COMPILE_ZODIAC) && !defined(COMPILE_OS5)
-	#define NEWGUI_256
+	#	define NEWGUI_256
 	#else
-	#undef UNUSED
+	#	undef UNUSED
 	#endif
 
 #elif defined(__MORPHOS__)

Modified: scummvm/trunk/common/util.cpp
===================================================================
--- scummvm/trunk/common/util.cpp	2007-05-01 09:34:53 UTC (rev 26689)
+++ scummvm/trunk/common/util.cpp	2007-05-01 09:37:40 UTC (rev 26690)
@@ -551,6 +551,7 @@
 #endif
 
 #ifdef PALMOS_MODE
+	extern void PalmFatalError(const char *err);
 	PalmFatalError(buf_output);
 #endif
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.