[Scummvm-cvs-logs] CVS: scummvm/sky autoroute.cpp,1.29,1.30 autoroute.h,1.13,1.14 compact.cpp,1.36,1.37 control.cpp,1.95,1.96 debug.cpp,1.18,1.19 debug.h,1.10,1.11 disk.cpp,1.67,1.68 disk.h,1.20,1.21 grid.h,1.12,1.13 intro.cpp,1.57,1.58 intro.h,1.10,1.11 logic.cpp,1.153,1.154 logic.h,1.42,1.43 mouse.cpp,1.40,1.41 mouse.h,1.28,1.29 rnc_deco.cpp,1.22,1.23 rnc_deco.h,1.8,1.9 screen.cpp,1.66,1.67 screen.h,1.21,1.22 sky.cpp,1.177,1.178 sky.h,1.66,1.67 skydefs.h,1.30,1.31 sound.cpp,1.52,1.53 sound.h,1.29,1.30 text.h,1.36,1.37

Max Horn fingolfin at users.sourceforge.net
Fri Jun 24 08:27:11 CEST 2005


Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17960/sky

Modified Files:
	autoroute.cpp autoroute.h compact.cpp control.cpp debug.cpp 
	debug.h disk.cpp disk.h grid.h intro.cpp intro.h logic.cpp 
	logic.h mouse.cpp mouse.h rnc_deco.cpp rnc_deco.h screen.cpp 
	screen.h sky.cpp sky.h skydefs.h sound.cpp sound.h text.h 
Log Message:
When including files from common/, explicitly use the common/ prefix

Index: autoroute.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/autoroute.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- autoroute.cpp	1 Jan 2005 16:09:20 -0000	1.29
+++ autoroute.cpp	24 Jun 2005 15:23:42 -0000	1.30
@@ -19,7 +19,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "common/util.h"
 #include "sky/autoroute.h"
 #include "sky/compact.h"

Index: autoroute.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/autoroute.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- autoroute.h	1 Jan 2005 16:09:20 -0000	1.13
+++ autoroute.h	24 Jun 2005 15:23:42 -0000	1.14
@@ -22,7 +22,7 @@
 #ifndef AUTOROUTE_H
 #define AUTOROUTE_H
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "common/scummsys.h"
 
 namespace Sky {

Index: compact.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compact.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- compact.cpp	10 May 2005 22:56:18 -0000	1.36
+++ compact.cpp	24 Jun 2005 15:23:42 -0000	1.37
@@ -19,7 +19,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "common/util.h"
 #include "common/file.h"
 #include "sky/compact.h"

Index: control.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/control.cpp,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96
--- control.cpp	10 May 2005 23:17:36 -0000	1.95
+++ control.cpp	24 Jun 2005 15:23:42 -0000	1.96
@@ -19,7 +19,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "common/config-manager.h"
 #include "common/file.h"
 #include "common/system.h"

Index: debug.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/debug.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- debug.cpp	21 Jun 2005 22:08:21 -0000	1.18
+++ debug.cpp	24 Jun 2005 15:23:43 -0000	1.19
@@ -19,7 +19,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "common/util.h"
 #include "sky/debug.h"
 #include "sky/grid.h"

Index: debug.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/debug.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- debug.h	21 Jun 2005 22:08:21 -0000	1.10
+++ debug.h	24 Jun 2005 15:23:43 -0000	1.11
@@ -22,7 +22,7 @@
 #ifndef SKY_DEBUG_H
 #define SKY_DEBUG_H
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "common/scummsys.h"
 #include "common/debugger.h"
 

Index: disk.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/disk.cpp,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- disk.cpp	10 May 2005 22:56:19 -0000	1.67
+++ disk.cpp	24 Jun 2005 15:23:43 -0000	1.68
@@ -19,7 +19,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "common/file.h"
 #include "common/util.h"
 #include "common/scummsys.h"

Index: disk.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/disk.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- disk.h	10 May 2005 22:56:19 -0000	1.20
+++ disk.h	24 Jun 2005 15:23:43 -0000	1.21
@@ -22,7 +22,7 @@
 #ifndef SKYDISK_H
 #define SKYDISK_H
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "common/scummsys.h"
 #include "common/str.h"
 #include "sky/rnc_deco.h"

Index: grid.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/grid.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- grid.h	1 Jan 2005 16:09:20 -0000	1.12
+++ grid.h	24 Jun 2005 15:23:43 -0000	1.13
@@ -22,7 +22,7 @@
 #ifndef SKYGRID_H
 #define SKYGRID_H
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "common/scummsys.h"
 #include "skydefs.h"
 

Index: intro.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/intro.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- intro.cpp	10 May 2005 23:48:43 -0000	1.57
+++ intro.cpp	24 Jun 2005 15:23:43 -0000	1.58
@@ -19,7 +19,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "common/util.h"
 #include "common/system.h"
 #include "sky/disk.h"

Index: intro.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/intro.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- intro.h	11 May 2005 00:01:34 -0000	1.10
+++ intro.h	24 Jun 2005 15:23:43 -0000	1.11
@@ -22,7 +22,7 @@
 #ifndef INTRO_H
 #define INTRO_H
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "common/scummsys.h"
 #include "sound/mixer.h"
 

Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/logic.cpp,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -d -r1.153 -r1.154
--- logic.cpp	22 Jun 2005 08:33:46 -0000	1.153
+++ logic.cpp	24 Jun 2005 15:23:43 -0000	1.154
@@ -19,7 +19,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "sky/autoroute.h"
 #include "sky/compact.h"
 #include "sky/control.h"

Index: logic.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/logic.h,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- logic.h	1 Jan 2005 16:09:21 -0000	1.42
+++ logic.h	24 Jun 2005 15:23:44 -0000	1.43
@@ -22,7 +22,7 @@
 #ifndef SKYLOGIC_H
 #define SKYLOGIC_H
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "common/util.h"
 
 namespace Sky {

Index: mouse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/mouse.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- mouse.cpp	1 Jan 2005 16:09:21 -0000	1.40
+++ mouse.cpp	24 Jun 2005 15:23:44 -0000	1.41
@@ -19,7 +19,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "common/system.h"
 #include "sky/disk.h"
 #include "sky/logic.h"

Index: mouse.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/mouse.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- mouse.h	1 Jan 2005 16:09:21 -0000	1.28
+++ mouse.h	24 Jun 2005 15:23:44 -0000	1.29
@@ -22,7 +22,7 @@
 #ifndef SKYMOUSE_H
 #define SKYMOUSE_H
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "common/scummsys.h"
 
 class OSystem;

Index: rnc_deco.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/rnc_deco.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- rnc_deco.cpp	28 Feb 2005 17:34:52 -0000	1.22
+++ rnc_deco.cpp	24 Jun 2005 15:23:44 -0000	1.23
@@ -19,7 +19,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "common/scummsys.h"
 #include "sky/rnc_deco.h"
 

Index: rnc_deco.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/rnc_deco.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- rnc_deco.h	11 Feb 2005 11:14:33 -0000	1.8
+++ rnc_deco.h	24 Jun 2005 15:23:44 -0000	1.9
@@ -22,7 +22,7 @@
 #ifndef RNC_DECO_H
 #define RNC_DECO_H
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 
 #define RNC_SIGNATURE   0x524E4301 // "RNC\001"
 

Index: screen.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/screen.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- screen.cpp	8 May 2005 21:49:49 -0000	1.66
+++ screen.cpp	24 Jun 2005 15:23:44 -0000	1.67
@@ -19,7 +19,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "common/system.h"
 #include "sky/disk.h"
 #include "sky/logic.h"

Index: screen.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/screen.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- screen.h	1 Jan 2005 16:09:21 -0000	1.21
+++ screen.h	24 Jun 2005 15:23:44 -0000	1.22
@@ -22,7 +22,7 @@
 #ifndef SKYSCREEN_H
 #define SKYSCREEN_H
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "common/scummsys.h"
 #include "sky/skydefs.h"
 

Index: sky.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sky.cpp,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -d -r1.177 -r1.178
--- sky.cpp	10 May 2005 23:48:44 -0000	1.177
+++ sky.cpp	24 Jun 2005 15:23:44 -0000	1.178
@@ -19,7 +19,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 
 #include "backends/fs/fs.h"
 

Index: sky.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sky.h,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- sky.h	1 Apr 2005 07:33:39 -0000	1.66
+++ sky.h	24 Jun 2005 15:23:45 -0000	1.67
@@ -22,7 +22,7 @@
 #ifndef SKYMAIN_H
 #define SKYMAIN_H
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "base/engine.h"
 
 class GameDetector;

Index: skydefs.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/skydefs.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- skydefs.h	1 Jan 2005 16:09:21 -0000	1.30
+++ skydefs.h	24 Jun 2005 15:23:45 -0000	1.31
@@ -22,7 +22,7 @@
 #ifndef SKYDEFS_H
 #define SKYDEFS_H
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 
 namespace Sky {
 

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sound.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- sound.cpp	11 May 2005 00:01:34 -0000	1.52
+++ sound.cpp	24 Jun 2005 15:23:45 -0000	1.53
@@ -19,7 +19,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "sky/disk.h"
 #include "sky/logic.h"
 #include "sky/sky.h"

Index: sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sound.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- sound.h	11 May 2005 00:01:34 -0000	1.29
+++ sound.h	24 Jun 2005 15:23:45 -0000	1.30
@@ -22,7 +22,7 @@
 #ifndef SKYSOUND_H
 #define SKYSOUND_H
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "common/scummsys.h"
 #include "sound/mixer.h"
 

Index: text.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/text.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- text.h	6 Jan 2005 16:10:34 -0000	1.36
+++ text.h	24 Jun 2005 15:23:45 -0000	1.37
@@ -22,7 +22,7 @@
 #ifndef SKYTEXT_H
 #define SKYTEXT_H
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "common/scummsys.h"
 
 namespace Sky {





More information about the Scummvm-git-logs mailing list