[Scummvm-cvs-logs] CVS: scummvm/scumm charset.cpp,2.63,2.64 imuse.cpp,2.94,2.95 scummvm.cpp,2.393,2.394

Max Horn fingolfin at users.sourceforge.net
Wed Sep 17 15:42:06 CEST 2003


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv4274/scumm

Modified Files:
	charset.cpp imuse.cpp scummvm.cpp 
Log Message:
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)

Index: charset.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/charset.cpp,v
retrieving revision 2.63
retrieving revision 2.64
diff -u -d -r2.63 -r2.64
--- charset.cpp	14 Sep 2003 00:37:47 -0000	2.63
+++ charset.cpp	17 Sep 2003 22:40:58 -0000	2.64
@@ -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) {
 

Index: imuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse.cpp,v
retrieving revision 2.94
retrieving revision 2.95
diff -u -d -r2.94 -r2.95
--- imuse.cpp	16 Sep 2003 11:44:47 -0000	2.94
+++ imuse.cpp	17 Sep 2003 22:40:58 -0000	2.95
@@ -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"

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.393
retrieving revision 2.394
diff -u -d -r2.393 -r2.394
--- scummvm.cpp	16 Sep 2003 11:44:48 -0000	2.393
+++ scummvm.cpp	17 Sep 2003 22:40:59 -0000	2.394
@@ -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"





More information about the Scummvm-git-logs mailing list