[Scummvm-cvs-logs] CVS: scummvm/backends/PalmOS/Src app.cpp,1.10,1.11 compile.h,1.2,1.3 start.cpp,1.10,1.11

Chris Apers chrilith at users.sourceforge.net
Mon Dec 20 09:42:00 CET 2004


Update of /cvsroot/scummvm/scummvm/backends/PalmOS/Src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7238

Modified Files:
	app.cpp compile.h start.cpp 
Log Message:
Added more compilation options

Index: app.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/app.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- app.cpp	10 Dec 2004 16:11:16 -0000	1.10
+++ app.cpp	20 Dec 2004 17:40:44 -0000	1.11
@@ -274,9 +274,11 @@
 	Boolean color;
 	Err error;
 
+#ifndef _DEBUG_ENGINE
 	// delete old databases
  	ModDelete();
- 
+#endif
+
 	// allocate global variables space
 	dataSize = sizeof(GlobalsDataType);
 	gVars = (GlobalsDataType *)MemPtrNew(dataSize);

Index: compile.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/compile.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- compile.h	9 Nov 2004 11:56:45 -0000	1.2
+++ compile.h	20 Dec 2004 17:40:44 -0000	1.3
@@ -1,11 +1,11 @@
 #ifndef __COMPILE_H__
 #define __COMPILE_H__
 
-// Engines
+// Engines, please define only one engine at a time
 #define DISABLE_SCUMM
-#define DISABLE_SIMON
+//#define DISABLE_SIMON
 #define DISABLE_SKY
-//#define DISABLE_SWORD1
+#define DISABLE_SWORD1
 #define DISABLE_SWORD2
 #define DISABLE_QUEEN
 #define DISABLE_SAGA
@@ -13,11 +13,15 @@
 #define DISABLE_AWE
 
 // PalmOS
+#define __PALM_OS__
 //#define DISABLE_LIGHTSPEED
 //#define DISABLE_TAPWAVE
+//#define DISABLE_ARM
 //#define REDUCE_MEMORY_USAGE
 
+//#define DEBUG_ARM
 //#define _DEBUG
 //#define _DEBUG_STDIO
+//#define _DEBUG_ENGINE
 
 #endif

Index: start.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/start.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- start.cpp	10 Dec 2004 15:41:50 -0000	1.10
+++ start.cpp	20 Dec 2004 17:40:44 -0000	1.11
@@ -28,6 +28,7 @@
 #include "games.h"
 #include "globals.h"
 #include "modules.h"
+#include "skin.h"
 
 #include "forms.h"
 /***********************************************************************
@@ -317,6 +318,7 @@
 					resizing = true;
 					PINGetScreenDimensions();
 					WinScreenGetPitch();
+					SknApplySkin();
 					resizing = false;
 				}
 			}
@@ -343,7 +345,9 @@
 
 
 		case sysAppLaunchCustomDeleteEngine:
+#ifndef _DEBUG_ENGINE
 			ModDelete();
+#endif
 			break;
 
 		case sysAppLaunchCmdNormalLaunch:	





More information about the Scummvm-git-logs mailing list