diff options
| author | Max Horn | 2008-09-17 17:31:29 +0000 |
|---|---|---|
| committer | Max Horn | 2008-09-17 17:31:29 +0000 |
| commit | a6dd4b7d4d8e3f5f4e63c20334f7f8b0ab9f0bef (patch) | |
| tree | 60029a6455721025780f03cb472ae533dc202050 | |
| parent | 2bcc5681d87dac00ad7ac53c5e4d91dc1201c73e (diff) | |
| download | scummvm-rg350-a6dd4b7d4d8e3f5f4e63c20334f7f8b0ab9f0bef.tar.gz scummvm-rg350-a6dd4b7d4d8e3f5f4e63c20334f7f8b0ab9f0bef.tar.bz2 scummvm-rg350-a6dd4b7d4d8e3f5f4e63c20334f7f8b0ab9f0bef.zip | |
Moved base/game.* to engines/game.*
svn-id: r34589
| -rw-r--r-- | base/module.mk | 1 | ||||
| -rw-r--r-- | common/advancedDetector.h | 2 | ||||
| -rw-r--r-- | engines/game.cpp (renamed from base/game.cpp) | 2 | ||||
| -rw-r--r-- | engines/game.h (renamed from base/game.h) | 4 | ||||
| -rw-r--r-- | engines/metaengine.h | 2 | ||||
| -rw-r--r-- | engines/module.mk | 4 | ||||
| -rw-r--r-- | gui/launcher.h | 2 |
7 files changed, 8 insertions, 9 deletions
diff --git a/base/module.mk b/base/module.mk index dd89c5fb2d..f12a710920 100644 --- a/base/module.mk +++ b/base/module.mk @@ -3,7 +3,6 @@ MODULE := base MODULE_OBJS := \ main.o \ commandLine.o \ - game.o \ plugins.o \ version.o diff --git a/common/advancedDetector.h b/common/advancedDetector.h index 40f5823d1b..b72b9fbfc4 100644 --- a/common/advancedDetector.h +++ b/common/advancedDetector.h @@ -28,8 +28,6 @@ #include "common/fs.h" #include "common/error.h" -#include "base/game.h" // For PlainGameDescriptor and GameList - #include "engines/metaengine.h" namespace Common { diff --git a/base/game.cpp b/engines/game.cpp index 7dff13e5f2..b3cb140e0a 100644 --- a/base/game.cpp +++ b/engines/game.cpp @@ -23,7 +23,7 @@ * */ -#include "base/game.h" +#include "engines/game.h" #include "base/plugins.h" #include "graphics/surface.h" diff --git a/base/game.h b/engines/game.h index 8fd1b47422..a1eed7acd9 100644 --- a/base/game.h +++ b/engines/game.h @@ -23,8 +23,8 @@ * */ -#ifndef BASE_GAME_H -#define BASE_GAME_H +#ifndef ENGINES_GAME_H +#define ENGINES_GAME_H #include "common/str.h" #include "common/array.h" diff --git a/engines/metaengine.h b/engines/metaengine.h index e57419a84c..3a9f930eec 100644 --- a/engines/metaengine.h +++ b/engines/metaengine.h @@ -29,7 +29,7 @@ #include "common/str.h" #include "common/error.h" -#include "base/game.h" +#include "engines/game.h" #include "base/plugins.h" class Engine; diff --git a/engines/module.mk b/engines/module.mk index f7dd71f403..8102046c5b 100644 --- a/engines/module.mk +++ b/engines/module.mk @@ -1,7 +1,9 @@ MODULE := engines MODULE_OBJS := \ + dialogs.o \ engine.o \ - dialogs.o + game.o + # Include common rules include $(srcdir)/rules.mk diff --git a/gui/launcher.h b/gui/launcher.h index a8173d220e..1b2b0a354e 100644 --- a/gui/launcher.h +++ b/gui/launcher.h @@ -26,7 +26,7 @@ #define LAUNCHER_DIALOG_H #include "gui/dialog.h" -#include "base/game.h" +#include "engines/game.h" #include "common/str.h" namespace GUI { |