[Scummvm-cvs-logs] CVS: scummvm/sky control.h,1.25,1.26 disk.cpp,1.46,1.47 screen.h,1.13,1.14 sky.h,1.49,1.50 sound.h,1.17,1.18

Max Horn fingolfin at users.sourceforge.net
Wed Sep 17 19:08:05 CEST 2003


Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1:/tmp/cvs-serv7244/sky

Modified Files:
	control.h disk.cpp screen.h sky.h sound.h 
Log Message:
moved engine.* to base; this fixes some linking issues when building a barebone ScummVM (or maybe I just want to increase our CVS stats? <g>)

Index: control.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/control.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- control.h	9 Aug 2003 19:40:55 -0000	1.25
+++ control.h	18 Sep 2003 02:07:18 -0000	1.26
@@ -25,7 +25,7 @@
 #include "common/stdafx.h"
 #include "common/scummsys.h"
 #include "sky/struc.h"
-#include "common/engine.h"
+#include "base/engine.h"
 #include "sky/screen.h"
 #include "sky/disk.h"
 #include "sky/mouse.h"

Index: disk.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/disk.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- disk.cpp	17 Sep 2003 21:06:16 -0000	1.46
+++ disk.cpp	18 Sep 2003 02:07:18 -0000	1.47
@@ -21,7 +21,7 @@
 
 #include "stdafx.h"
 #include "common/scummsys.h"
-#include "common/engine.h"
+#include "base/engine.h"
 #include "sky/disk.h"
 #include "sky/skydefs.h"
 #include "sky/sky.h"

Index: screen.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/screen.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- screen.h	6 Aug 2003 10:06:19 -0000	1.13
+++ screen.h	18 Sep 2003 02:07:18 -0000	1.14
@@ -24,7 +24,7 @@
 
 #include "stdafx.h"
 #include <string.h>
-#include "common/engine.h"
+#include "base/engine.h"
 #include "common/scummsys.h"
 #include "sky/disk.h"
 #include "sky/skydefs.h"

Index: sky.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sky.h,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- sky.h	3 Aug 2003 15:50:39 -0000	1.49
+++ sky.h	18 Sep 2003 02:07:18 -0000	1.50
@@ -23,7 +23,7 @@
 #define SKYMAIN_H
 
 #include <stdio.h>
-#include "common/engine.h"
+#include "base/engine.h"
 #include "common/util.h"
 #include "common/timer.h"
 #include "sound/mixer.h"

Index: sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sound.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- sound.h	5 Sep 2003 20:48:32 -0000	1.17
+++ sound.h	18 Sep 2003 02:07:18 -0000	1.18
@@ -24,7 +24,7 @@
 
 #include "sound/mixer.h"
 #include "sky/disk.h"
-#include "common/engine.h"
+#include "base/engine.h"
 
 enum {
 	SOUND_CH0    = 0,





More information about the Scummvm-git-logs mailing list