diff options
| -rw-r--r-- | common/scummsys.h | 34 | ||||
| -rw-r--r-- | common/stdafx.h | 2 | ||||
| -rw-r--r-- | common/system.cpp | 10 |
3 files changed, 29 insertions, 17 deletions
diff --git a/common/scummsys.h b/common/scummsys.h index 5b3b6205cd..6052ecbcbb 100644 --- a/common/scummsys.h +++ b/common/scummsys.h @@ -68,7 +68,7 @@ typedef signed char int8; typedef signed short int16; typedef signed long int32; - + #define START_PACK_STRUCTS pack(push, 1) #define END_PACK_STRUCTS pack(pop) @@ -106,14 +106,14 @@ #ifndef CONFIG_H #ifdef X11_BACKEND - + // You need to set this manually if necessary // #define SCUMM_LITTLE_ENDIAN - + #else /* need this for the SDL_BYTEORDER define */ #include <SDL_byteorder.h> - + #if SDL_BYTEORDER == SDL_LIL_ENDIAN #define SCUMM_LITTLE_ENDIAN #elif SDL_BYTEORDER == SDL_BIG_ENDIAN @@ -149,17 +149,21 @@ #define END_PACK_STRUCTS pack () #endif -#elif defined(__PALMOS_TRAPS__) // PALMOS - #include <PalmOS.h> +#elif defined(__PALMOS_TRAPS__) || defined (__PALMOS_ARMLET__) // PALMOS + #include "palmversion.h" #include "globals.h" #include "extend.h" - + #define STRINGBUFLEN 256 #define scumm_stricmp stricmp #define scumm_strnicmp strnicmp +#ifdef PALMOS_68K #define SCUMM_BIG_ENDIAN +#else + #define SCUMM_LITTLE_ENDIAN +#endif #define SCUMM_NEED_ALIGNMENT typedef unsigned char byte; @@ -170,11 +174,13 @@ typedef signed char int8; typedef signed short int16; typedef signed long int32; - + #define START_PACK_STRUCTS pack (1) #define END_PACK_STRUCTS pack () +#if !defined(COMPILE_ZODIAC) && !defined(PALMOS_ARM) #define NEWGUI_256 +#endif #elif defined(__MORPHOS__) #define scumm_stricmp stricmp @@ -220,7 +226,7 @@ #elif defined __GP32__ //ph0x #define SCUMM_NEED_ALIGNMENT - #define SCUMM_LITTLE_ENDIAN + #define SCUMM_LITTLE_ENDIAN #define scumm_stricmp stricmp #define scumm_strnicmp strnicmp @@ -240,7 +246,7 @@ #define END_PACK_STRUCTS pack(pop) #elif defined __PLAYSTATION2__ #define SCUMM_NEED_ALIGNMENT - #define SCUMM_LITTLE_ENDIAN + #define SCUMM_LITTLE_ENDIAN #define scumm_stricmp strcasecmp #define scumm_strnicmp strncasecmp @@ -317,9 +323,9 @@ #define scumm_stricmp strcasecmp #define scumm_strnicmp strncasecmp - #define CDECL + #define CDECL #define SCUMM_NEED_ALIGNMENT - #define SCUMM_LITTLE_ENDIAN + #define SCUMM_LITTLE_ENDIAN #define CHECK_HEAP #define SMALL_SCREEN_DEVICE @@ -333,7 +339,7 @@ typedef signed char int8; typedef signed short int int16; typedef signed long int int32; - + #define START_PACK_STRUCTS pack (push,1) #define END_PACK_STRUCTS pack(pop) #else @@ -346,7 +352,7 @@ // #if defined(__GNUC__) #define GCC_PACK __attribute__((packed)) - #define NORETURN __attribute__((__noreturn__)) + #define NORETURN __attribute__((__noreturn__)) #else #define GCC_PACK #endif diff --git a/common/stdafx.h b/common/stdafx.h index 2e15d84c33..ea386476dc 100644 --- a/common/stdafx.h +++ b/common/stdafx.h @@ -113,7 +113,7 @@ #include <devices/timer.h> #undef CMD_INVALID #endif -#if !defined(macintosh) +#if !defined(macintosh) && !defined(PALMOS_ARM) #include <sys/types.h> #if !defined(__PLAYSTATION2__) && !defined(__PSP__) && !defined(__amigaos4__) #include <sys/uio.h> diff --git a/common/system.cpp b/common/system.cpp index c2bf42ebbe..da7bded979 100644 --- a/common/system.cpp +++ b/common/system.cpp @@ -52,8 +52,14 @@ OSystem *OSystem::makeInstance() { return OSystem_WINCE3_create(); #elif defined(__GP32__) // ph0x return OSystem_GP32_create(); -#elif defined(__PALM_OS__) //chrilith - return OSystem_PALMOS_create(); +#elif defined(PALMOS_MODE) //chrilith +# if defined(COMPILE_OS5) + return OSystem_PalmOS5_create(); +# elif defined(COMPILE_ZODIAC) + return OSystem_PalmZodiac_create(); +# else + return OSystem_PALMOS_create(); // old backend +# endif #elif defined(__PLAYSTATION2__) return OSystem_PS2_create(); #elif defined(__PSP__) |