[Scummvm-cvs-logs] SF.net SVN: scummvm: [26693] scummvm/trunk/backends/platform/PalmOS/Src/ prefixes

[chrilith at users.sourceforge.net]

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

Log Message:
-----------
Prefix files cleanup
Added support for Parallaction and Cruise engines
Added ZLIB support

Modified Paths:
--------------
    scummvm/trunk/backends/platform/PalmOS/Src/prefixes/compile.h
    scummvm/trunk/backends/platform/PalmOS/Src/prefixes/native_agi.h
    scummvm/trunk/backends/platform/PalmOS/Src/prefixes/native_cine.h
    scummvm/trunk/backends/platform/PalmOS/Src/prefixes/native_common.h
    scummvm/trunk/backends/platform/PalmOS/Src/prefixes/native_lure.h
    scummvm/trunk/backends/platform/PalmOS/Src/prefixes/prefix_frontend.h

Modified: scummvm/trunk/backends/platform/PalmOS/Src/prefixes/compile.h
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/prefixes/compile.h	2007-05-01 09:41:35 UTC (rev 26692)
+++ scummvm/trunk/backends/platform/PalmOS/Src/prefixes/compile.h	2007-05-01 09:44:47 UTC (rev 26693)
@@ -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
+#include "compile_base.h"
 
-#define PALMOS_MODE
-//#define COMPILE_ZODIAC
-#define COMPILE_OS5
-
 //#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

Modified: scummvm/trunk/backends/platform/PalmOS/Src/prefixes/native_agi.h
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/prefixes/native_agi.h	2007-05-01 09:41:35 UTC (rev 26692)
+++ scummvm/trunk/backends/platform/PalmOS/Src/prefixes/native_agi.h	2007-05-01 09:44:47 UTC (rev 26693)
@@ -4,4 +4,8 @@
 #include "native_common.h"
 #undef DISABLE_AGI
 
+#undef USE_MAD
+#undef USE_VORBIS
+#undef USE_TREMOR
+
 #endif

Modified: scummvm/trunk/backends/platform/PalmOS/Src/prefixes/native_cine.h
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/prefixes/native_cine.h	2007-05-01 09:41:35 UTC (rev 26692)
+++ scummvm/trunk/backends/platform/PalmOS/Src/prefixes/native_cine.h	2007-05-01 09:44:47 UTC (rev 26693)
@@ -3,5 +3,10 @@
 
 #include "native_common.h"
 #undef DISABLE_CINE
+#define _DEBUG
 
+#undef USE_MAD
+#undef USE_VORBIS
+#undef USE_TREMOR
+
 #endif

Modified: scummvm/trunk/backends/platform/PalmOS/Src/prefixes/native_common.h
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/prefixes/native_common.h	2007-05-01 09:41:35 UTC (rev 26692)
+++ scummvm/trunk/backends/platform/PalmOS/Src/prefixes/native_common.h	2007-05-01 09:44:47 UTC (rev 26693)
@@ -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

Modified: scummvm/trunk/backends/platform/PalmOS/Src/prefixes/native_lure.h
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/prefixes/native_lure.h	2007-05-01 09:41:35 UTC (rev 26692)
+++ scummvm/trunk/backends/platform/PalmOS/Src/prefixes/native_lure.h	2007-05-01 09:44:47 UTC (rev 26693)
@@ -4,4 +4,8 @@
 #include "native_common.h"
 #undef DISABLE_LURE
 
+#undef USE_MAD
+#undef USE_VORBIS
+#undef USE_TREMOR
+
 #endif

Modified: scummvm/trunk/backends/platform/PalmOS/Src/prefixes/prefix_frontend.h
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/prefixes/prefix_frontend.h	2007-05-01 09:41:35 UTC (rev 26692)
+++ scummvm/trunk/backends/platform/PalmOS/Src/prefixes/prefix_frontend.h	2007-05-01 09:44:47 UTC (rev 26693)
@@ -3,6 +3,7 @@
 
 #define PALMOS_68K
 #define PALMOS_MODE
+
 //#define _DEBUG_ENGINE
 
 #endif


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