aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorMax Horn2003-09-17 22:41:01 +0000
committerMax Horn2003-09-17 22:41:01 +0000
commitc1a678afeb5100a99030bb51782e5de98d771997 (patch)
treebae1b38145179bae284a14c983c9541db7644f8c /scumm
parent0b16afb067a7b3f09a97507675eaa4872a59df38 (diff)
downloadscummvm-rg350-c1a678afeb5100a99030bb51782e5de98d771997.tar.gz
scummvm-rg350-c1a678afeb5100a99030bb51782e5de98d771997.tar.bz2
scummvm-rg350-c1a678afeb5100a99030bb51782e5de98d771997.zip
new module 'base'; moved gameDetector.*, main.cpp and base/plugins.* there (this removes the need for an ugly hack in the build system, and is also conceptionally cleaner)
svn-id: r10282
Diffstat (limited to 'scumm')
-rw-r--r--scumm/charset.cpp2
-rw-r--r--scumm/imuse.cpp2
-rw-r--r--scumm/scummvm.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/scumm/charset.cpp b/scumm/charset.cpp
index e86cde493c..f2dd44d28f 100644
--- a/scumm/charset.cpp
+++ b/scumm/charset.cpp
@@ -22,7 +22,7 @@
#include "charset.h"
#include "scumm.h"
#include "nut_renderer.h"
-#include "common/gameDetector.h"
+#include "base/gameDetector.h"
CharsetRenderer::CharsetRenderer(Scumm *vm) {
diff --git a/scumm/imuse.cpp b/scumm/imuse.cpp
index a02acd538c..30ca18ba98 100644
--- a/scumm/imuse.cpp
+++ b/scumm/imuse.cpp
@@ -22,8 +22,8 @@
#include "stdafx.h"
+#include "base/gameDetector.h" // For kDefaultMasterVolume etc.
#include "common/util.h"
-#include "common/gameDetector.h" // For kDefaultMasterVolume etc.
#include "scumm/imuse.h"
#include "scumm/imuse_internal.h"
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp
index 408e3f9dae..1f5f2ab1a3 100644
--- a/scumm/scummvm.cpp
+++ b/scumm/scummvm.cpp
@@ -23,7 +23,7 @@
#include "stdafx.h"
#include "common/config-file.h"
-#include "common/gameDetector.h"
+#include "base/gameDetector.h"
#include "gui/console.h"
#include "gui/message.h"