[Scummvm-cvs-logs] SF.net SVN: scummvm: [28107] scummex/branches/gsoc2007-gameresbrowser/src/ browser/streams/scummsys.h

[zbychs at users.sourceforge.net]

Revision: 28107
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28107&view=rev
Author:   zbychs
Date:     2007-07-15 09:39:08 -0700 (Sun, 15 Jul 2007)

Log Message:
-----------
SCUMM_XXX_ENDIAN is now set using wxBYTE_ORDER

Modified Paths:
--------------
    scummex/branches/gsoc2007-gameresbrowser/src/browser/streams/scummsys.h

Modified: scummex/branches/gsoc2007-gameresbrowser/src/browser/streams/scummsys.h
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/browser/streams/scummsys.h	2007-07-15 16:04:34 UTC (rev 28106)
+++ scummex/branches/gsoc2007-gameresbrowser/src/browser/streams/scummsys.h	2007-07-15 16:39:08 UTC (rev 28107)
@@ -26,6 +26,18 @@
 #ifndef COMMON_SCUMMSYS_H
 #define COMMON_SCUMMSYS_H
 
+#ifndef wxBYTE_ORDER
+	#error wxBYTE_ORDER must be defined
+#endif
+
+#if (wxBYTE_ORDER == wxLITTLE_ENDIAN)
+	#define SCUMM_LITTLE_ENDIAN
+#elif (wxBYTE_ORDER == wxBIG_ENDIAN)
+	#define SCUMM_BIG_ENDIAN
+#else
+	#error usupported endianness (wxBYTE_ORDER)
+#endif
+
 #if !defined(COMMON_STDAFX_H) && !defined(__PLAYSTATION2__)
 #error Included scummsys.h without including stdafx.h first!
 #endif
@@ -88,7 +100,7 @@
 	#define scumm_stricmp strcasecmp
 	#define scumm_strnicmp strncasecmp
 
-	#define SCUMM_LITTLE_ENDIAN	
+	//#define SCUMM_LITTLE_ENDIAN	
 	#define SCUMM_NEED_ALIGNMENT
 
 	#define SMALL_SCREEN_DEVICE
@@ -116,7 +128,7 @@
 	#define scumm_strnicmp _strnicmp
 	#define snprintf _snprintf
 
-	#define SCUMM_LITTLE_ENDIAN
+	//#define SCUMM_LITTLE_ENDIAN
 
 	#ifndef __GNUC__
 		#define FORCEINLINE __forceinline
@@ -140,7 +152,7 @@
 	#define scumm_strnicmp _strnicmp
 	#define snprintf _snprintf
 
-	#define SCUMM_LITTLE_ENDIAN
+	//#define SCUMM_LITTLE_ENDIAN
 
 	// FIXME: Do you really need to use 'long' on this port? Please replace
 	// this comment with a new comment that states so, and ideally also
@@ -166,7 +178,7 @@
 	#define scumm_stricmp stricmp
 	#define scumm_strnicmp strnicmp
 
-	#define SCUMM_LITTLE_ENDIAN
+	//#define SCUMM_LITTLE_ENDIAN
 
 	#define PLUGIN_EXPORT __declspec(dllexport)
 
@@ -184,7 +196,7 @@
 		#else
 		/* need this for the SDL_BYTEORDER define */
 		
-		#define SCUMM_LITTLE_ENDIAN
+		//#define SCUMM_LITTLE_ENDIAN
 
 		/* ZZZ
 		#include <SDL_byteorder.h>
@@ -214,9 +226,9 @@
 	#define scumm_strnicmp strnicmp
 
 	#ifdef PALMOS_68K
-	#define SCUMM_BIG_ENDIAN
+	//#define SCUMM_BIG_ENDIAN
 	#else
-	#define SCUMM_LITTLE_ENDIAN
+	//#define SCUMM_LITTLE_ENDIAN
 	#endif
 
 	#define SCUMM_NEED_ALIGNMENT
@@ -238,7 +250,7 @@
 	#define scumm_stricmp stricmp
 	#define scumm_strnicmp strnicmp
 
-	#define SCUMM_BIG_ENDIAN
+	//#define SCUMM_BIG_ENDIAN
 	#define SCUMM_NEED_ALIGNMENT
 
 	// FIXME: Do you really need to use 'long' on this port? Please replace
@@ -251,7 +263,7 @@
 	#define scumm_stricmp strcasecmp
 	#define scumm_strnicmp strncasecmp
 
-	#define SCUMM_LITTLE_ENDIAN
+	//#define SCUMM_LITTLE_ENDIAN
 	#define SCUMM_NEED_ALIGNMENT
 
 #elif defined(__GP32__)
@@ -259,7 +271,7 @@
 	#define scumm_stricmp stricmp
 	#define scumm_strnicmp strnicmp
 
-	#define SCUMM_LITTLE_ENDIAN 
+	//#define SCUMM_LITTLE_ENDIAN 
 	#define SCUMM_NEED_ALIGNMENT
 
 	// Override typenames. uint is already defined by system header files.
@@ -280,7 +292,7 @@
 	#define scumm_stricmp strcasecmp
 	#define scumm_strnicmp strncasecmp
 
-	#define SCUMM_LITTLE_ENDIAN 
+	//#define SCUMM_LITTLE_ENDIAN 
 	#define SCUMM_NEED_ALIGNMENT
 
 #elif defined(__PSP__)
@@ -288,7 +300,7 @@
 	#define scumm_stricmp strcasecmp
 	#define scumm_strnicmp strncasecmp
 
-	#define	SCUMM_LITTLE_ENDIAN
+	//#define	SCUMM_LITTLE_ENDIAN
 	#define	SCUMM_NEED_ALIGNMENT
 
 #elif defined(__amigaos4__)
@@ -296,7 +308,7 @@
 	#define	scumm_stricmp strcasecmp
 	#define	scumm_strnicmp strncasecmp
 
-	#define	SCUMM_BIG_ENDIAN
+	//#define	SCUMM_BIG_ENDIAN
 	#define	SCUMM_NEED_ALIGNMENT
 
 #elif defined (__DS__) //NeilM
@@ -305,7 +317,7 @@
 	#define scumm_strnicmp strnicmp
 
 	#define SCUMM_NEED_ALIGNMENT
-	#define SCUMM_LITTLE_ENDIAN 
+	//#define SCUMM_LITTLE_ENDIAN 
 
 	#include "nds/jtypes.h"
 


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