aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Apers2008-05-23 11:13:15 +0000
committerChris Apers2008-05-23 11:13:15 +0000
commit1b69c18b566569bf7a2e4db83bfd8c252bb69a51 (patch)
tree59991d57733279f44155b8eb5f337b6d0771b37e
parent69594a118ee21c5c6185d562fc4bd860b92150af (diff)
downloadscummvm-rg350-1b69c18b566569bf7a2e4db83bfd8c252bb69a51.tar.gz
scummvm-rg350-1b69c18b566569bf7a2e4db83bfd8c252bb69a51.tar.bz2
scummvm-rg350-1b69c18b566569bf7a2e4db83bfd8c252bb69a51.zip
Fixed PalmOS compilation
svn-id: r32223
-rw-r--r--backends/platform/PalmOS/Src/prefixes/native_kyra.h2
-rw-r--r--backends/platform/PalmOS/Src/prefixes/native_sword1.h2
-rw-r--r--engines/agos/agos.cpp4
-rw-r--r--engines/gob/inter.cpp4
-rw-r--r--engines/scumm/saveload.cpp4
-rw-r--r--engines/scumm/script_v6.cpp4
6 files changed, 9 insertions, 11 deletions
diff --git a/backends/platform/PalmOS/Src/prefixes/native_kyra.h b/backends/platform/PalmOS/Src/prefixes/native_kyra.h
index c89b0a5b93..3b09c63a6f 100644
--- a/backends/platform/PalmOS/Src/prefixes/native_kyra.h
+++ b/backends/platform/PalmOS/Src/prefixes/native_kyra.h
@@ -2,6 +2,6 @@
#define PREFIX_H
#include "native_common.h"
-#define ENABLE_KYRA
+#define ENABLE_KYRA STATIC_PLUGIN
#endif
diff --git a/backends/platform/PalmOS/Src/prefixes/native_sword1.h b/backends/platform/PalmOS/Src/prefixes/native_sword1.h
index aaae4c9b86..6ae7bb9050 100644
--- a/backends/platform/PalmOS/Src/prefixes/native_sword1.h
+++ b/backends/platform/PalmOS/Src/prefixes/native_sword1.h
@@ -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
diff --git a/engines/agos/agos.cpp b/engines/agos/agos.cpp
index a79b84843c..51619bd3cb 100644
--- a/engines/agos/agos.cpp
+++ b/engines/agos/agos.cpp
@@ -23,7 +23,7 @@
*
*/
-
+#include <time.h> // for AGOSEngine::getTime()
#include "common/config-manager.h"
#include "common/file.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 {
diff --git a/engines/gob/inter.cpp b/engines/gob/inter.cpp
index dd3fdf3684..9e5005f443 100644
--- a/engines/gob/inter.cpp
+++ b/engines/gob/inter.cpp
@@ -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) {
diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp
index a8ef26c484..36b82519e9 100644
--- a/engines/scumm/saveload.cpp
+++ b/engines/scumm/saveload.cpp
@@ -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 {
diff --git a/engines/scumm/script_v6.cpp b/engines/scumm/script_v6.cpp
index faae72b6dd..04ea53137b 100644
--- a/engines/scumm/script_v6.cpp
+++ b/engines/scumm/script_v6.cpp
@@ -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)