diff options
| author | Chris Apers | 2007-05-01 09:44:47 +0000 |
|---|---|---|
| committer | Chris Apers | 2007-05-01 09:44:47 +0000 |
| commit | ab16dd234f6ffc5722154123d76ee83c117213de (patch) | |
| tree | 571328174c99b72f64035b0d3827752fe949c76c | |
| parent | 3e3a808610ef2850c21147e436c26b33aa17cbee (diff) | |
| download | scummvm-rg350-ab16dd234f6ffc5722154123d76ee83c117213de.tar.gz scummvm-rg350-ab16dd234f6ffc5722154123d76ee83c117213de.tar.bz2 scummvm-rg350-ab16dd234f6ffc5722154123d76ee83c117213de.zip | |
Prefix files cleanup
Added support for Parallaction and Cruise engines
Added ZLIB support
svn-id: r26693
6 files changed, 26 insertions, 12 deletions
diff --git a/backends/platform/PalmOS/Src/prefixes/compile.h b/backends/platform/PalmOS/Src/prefixes/compile.h index f54a56d2ca..f8c5ca1cbf 100644 --- a/backends/platform/PalmOS/Src/prefixes/compile.h +++ b/backends/platform/PalmOS/Src/prefixes/compile.h @@ -43,6 +43,7 @@ #define DISABLE_AGI #define DISABLE_TOUCHE #define DISABLE_PARALLACTION +#define DISABLE_CRUISE // ScummVM #define DISABLE_HQ_SCALERS @@ -50,23 +51,24 @@ //#define CT_NO_TRANSPARENCY //#define REDUCE_MEMORY_USAGE -// PalmOS -//#define STDLIB_TRACE_MEMORY -//#define _DEBUG - -#define PALMOS_MODE -//#define COMPILE_ZODIAC -#define COMPILE_OS5 +#include "compile_base.h" //#define DISABLE_ADLIB //#define DISABLE_LIGHTSPEED #ifdef COMPILE_ZODIAC -# define DISABLE_SONY +# undef DISABLE_FANCY_THEMES +# define USE_ZLIB +// set an external ZLIB since save/load implementation +// doesn't support built-in zodiac version which is 1.1.4 +// (seen inflateInit2 which err on "MAX_WBITS + 32") +# define USE_ZLIB_EXTERNAL +# define DISABLE_SONY #endif #ifdef COMPILE_OS5 -# define DISABLE_TAPWAVE +# define DISABLE_TAPWAVE +# define USE_ZLIB #endif #endif diff --git a/backends/platform/PalmOS/Src/prefixes/native_agi.h b/backends/platform/PalmOS/Src/prefixes/native_agi.h index 496cf7c85b..790f108efa 100644 --- a/backends/platform/PalmOS/Src/prefixes/native_agi.h +++ b/backends/platform/PalmOS/Src/prefixes/native_agi.h @@ -4,4 +4,8 @@ #include "native_common.h" #undef DISABLE_AGI +#undef USE_MAD +#undef USE_VORBIS +#undef USE_TREMOR + #endif diff --git a/backends/platform/PalmOS/Src/prefixes/native_cine.h b/backends/platform/PalmOS/Src/prefixes/native_cine.h index 212a5544d0..bacdfa2047 100644 --- a/backends/platform/PalmOS/Src/prefixes/native_cine.h +++ b/backends/platform/PalmOS/Src/prefixes/native_cine.h @@ -3,5 +3,10 @@ #include "native_common.h" #undef DISABLE_CINE +#define _DEBUG + +#undef USE_MAD +#undef USE_VORBIS +#undef USE_TREMOR #endif diff --git a/backends/platform/PalmOS/Src/prefixes/native_common.h b/backends/platform/PalmOS/Src/prefixes/native_common.h index c04f5e1538..af4db70932 100644 --- a/backends/platform/PalmOS/Src/prefixes/native_common.h +++ b/backends/platform/PalmOS/Src/prefixes/native_common.h @@ -2,8 +2,6 @@ #define ZNATIVE_COMMON_H #include "compile.h" -#include "palmmad.h" -#include "palmtremor.h" #define __TWNEW_H__ @@ -12,7 +10,7 @@ #define USE_MAD #define USE_TREMOR -//#define USE_VORBIS +#define USE_VORBIS //#define USE_MPEG2 // enable assert diff --git a/backends/platform/PalmOS/Src/prefixes/native_lure.h b/backends/platform/PalmOS/Src/prefixes/native_lure.h index 1d9005045c..b017c46fe6 100644 --- a/backends/platform/PalmOS/Src/prefixes/native_lure.h +++ b/backends/platform/PalmOS/Src/prefixes/native_lure.h @@ -4,4 +4,8 @@ #include "native_common.h" #undef DISABLE_LURE +#undef USE_MAD +#undef USE_VORBIS +#undef USE_TREMOR + #endif diff --git a/backends/platform/PalmOS/Src/prefixes/prefix_frontend.h b/backends/platform/PalmOS/Src/prefixes/prefix_frontend.h index 6c7d749539..8473214746 100644 --- a/backends/platform/PalmOS/Src/prefixes/prefix_frontend.h +++ b/backends/platform/PalmOS/Src/prefixes/prefix_frontend.h @@ -3,6 +3,7 @@ #define PALMOS_68K #define PALMOS_MODE + //#define _DEBUG_ENGINE #endif |