[Scummvm-cvs-logs] SF.net SVN: scummvm: [32223] scummvm/trunk

[chrilith at users.sourceforge.net]

Revision: 32223
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32223&view=rev
Author:   chrilith
Date:     2008-05-23 04:13:15 -0700 (Fri, 23 May 2008)

Log Message:
-----------
Fixed PalmOS compilation

Modified Paths:
--------------
    scummvm/trunk/backends/platform/PalmOS/Src/prefixes/native_kyra.h
    scummvm/trunk/backends/platform/PalmOS/Src/prefixes/native_sword1.h
    scummvm/trunk/engines/agos/agos.cpp
    scummvm/trunk/engines/gob/inter.cpp
    scummvm/trunk/engines/scumm/saveload.cpp
    scummvm/trunk/engines/scumm/script_v6.cpp

Modified: scummvm/trunk/backends/platform/PalmOS/Src/prefixes/native_kyra.h
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/prefixes/native_kyra.h	2008-05-23 11:11:55 UTC (rev 32222)
+++ scummvm/trunk/backends/platform/PalmOS/Src/prefixes/native_kyra.h	2008-05-23 11:13:15 UTC (rev 32223)
@@ -2,6 +2,6 @@
 #define PREFIX_H
 
 #include "native_common.h"
-#define ENABLE_KYRA
+#define ENABLE_KYRA STATIC_PLUGIN
 
 #endif

Modified: scummvm/trunk/backends/platform/PalmOS/Src/prefixes/native_sword1.h
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/prefixes/native_sword1.h	2008-05-23 11:11:55 UTC (rev 32222)
+++ scummvm/trunk/backends/platform/PalmOS/Src/prefixes/native_sword1.h	2008-05-23 11:13:15 UTC (rev 32223)
@@ -2,7 +2,7 @@
 #define PREFIX_H
 
 #include "native_common.h"
-#define ENABLE_SWORD1
+#define ENABLE_SWORD1 STATIC_PLUGIN
 #define USE_MPEG2
 #define USE_VORBIS
 

Modified: scummvm/trunk/engines/agos/agos.cpp
===================================================================
--- scummvm/trunk/engines/agos/agos.cpp	2008-05-23 11:11:55 UTC (rev 32222)
+++ scummvm/trunk/engines/agos/agos.cpp	2008-05-23 11:13:15 UTC (rev 32223)
@@ -23,8 +23,8 @@
  *
  */
 
+#include <time.h>	// for AGOSEngine::getTime()
 
-
 #include "common/config-manager.h"
 #include "common/file.h"
 #include "common/system.h"
@@ -38,8 +38,6 @@
 #include "sound/mididrv.h"
 #include "sound/mods/protracker.h"
 
-#include <time.h>	// for AGOSEngine::getTime()
-
 using Common::File;
 
 namespace AGOS {

Modified: scummvm/trunk/engines/gob/inter.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter.cpp	2008-05-23 11:11:55 UTC (rev 32222)
+++ scummvm/trunk/engines/gob/inter.cpp	2008-05-23 11:13:15 UTC (rev 32223)
@@ -23,6 +23,8 @@
  *
  */
 
+#include <time.h>	// FIXME: for Inter::renewTimeInVars()
+
 #include "common/endian.h"
 
 #include "gob/gob.h"
@@ -35,8 +37,6 @@
 #include "gob/scenery.h"
 #include "gob/sound/sound.h"
 
-#include <time.h>	// FIXME: for Inter::renewTimeInVars()
-
 namespace Gob {
 
 Inter::Inter(GobEngine *vm) : _vm(vm) {

Modified: scummvm/trunk/engines/scumm/saveload.cpp
===================================================================
--- scummvm/trunk/engines/scumm/saveload.cpp	2008-05-23 11:11:55 UTC (rev 32222)
+++ scummvm/trunk/engines/scumm/saveload.cpp	2008-05-23 11:13:15 UTC (rev 32223)
@@ -23,6 +23,8 @@
  *
  */
 
+#include <time.h>	// for ScummEngine::saveInfos / ScummEngine::loadInfos
+
 #include "common/config-manager.h"
 #include "common/savefile.h"
 #include "common/system.h"
@@ -44,8 +46,6 @@
 #include "sound/audiocd.h"
 #include "sound/mixer.h"
 
-#include <time.h>	// for ScummEngine::saveInfos / ScummEngine::loadInfos
-
 namespace Scumm {
 
 struct SaveGameHeader {

Modified: scummvm/trunk/engines/scumm/script_v6.cpp
===================================================================
--- scummvm/trunk/engines/scumm/script_v6.cpp	2008-05-23 11:11:55 UTC (rev 32222)
+++ scummvm/trunk/engines/scumm/script_v6.cpp	2008-05-23 11:13:15 UTC (rev 32223)
@@ -23,6 +23,8 @@
  *
  */
 
+#include <time.h>	// for ScummEngine_v6::o6_getDateTime()
+
 #include "common/config-manager.h"
 #include "common/system.h"
 
@@ -44,8 +46,6 @@
 #include "sound/mididrv.h"
 #include "sound/mixer.h"
 
-#include <time.h>	// for ScummEngine_v6::o6_getDateTime()
-
 namespace Scumm {
 
 #define OPCODE(x)	_OPCODE(ScummEngine_v6, x)


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