[Scummvm-cvs-logs] CVS: scummvm/simon charset.cpp,1.36,1.37 cursor.cpp,1.6,1.7 debug.cpp,1.37,1.38 debugger.cpp,1.18,1.19 icons.cpp,1.5,1.6 items.cpp,1.120,1.121 midi.cpp,1.69,1.70 midiparser_s1d.cpp,1.11,1.12 res.cpp,1.32,1.33 saveload.cpp,1.11,1.12 simon.cpp,1.505,1.506 sound.cpp,1.86,1.87 verb.cpp,1.26,1.27 vga.cpp,1.129,1.130

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


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

Modified Files:
	charset.cpp cursor.cpp debug.cpp debugger.cpp icons.cpp 
	items.cpp midi.cpp midiparser_s1d.cpp res.cpp saveload.cpp 
	simon.cpp sound.cpp verb.cpp vga.cpp 
Log Message:
When including files from common/, explicitly use the common/ prefix

Index: charset.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/charset.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- charset.cpp	6 May 2005 11:37:33 -0000	1.36
+++ charset.cpp	24 Jun 2005 15:23:40 -0000	1.37
@@ -19,7 +19,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "simon/simon.h"
 #include "simon/intern.h"
 

Index: cursor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/cursor.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- cursor.cpp	6 May 2005 11:37:33 -0000	1.6
+++ cursor.cpp	24 Jun 2005 15:23:40 -0000	1.7
@@ -19,7 +19,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 
 #include "simon/simon.h"
 #include "simon/intern.h"

Index: debug.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/debug.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- debug.cpp	8 May 2005 21:49:48 -0000	1.37
+++ debug.cpp	24 Jun 2005 15:23:40 -0000	1.38
@@ -20,7 +20,7 @@
  */
 
 // Simon debug functions
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "simon/simon.h"
 #include "simon/intern.h"
 #include "simon/debug.h"

Index: debugger.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/debugger.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- debugger.cpp	24 Apr 2005 12:21:53 -0000	1.18
+++ debugger.cpp	24 Jun 2005 15:23:40 -0000	1.19
@@ -19,7 +19,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "common/config-manager.h"
 #include "common/debugger.cpp"
 #include "simon/debugger.h"

Index: icons.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/icons.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- icons.cpp	10 May 2005 22:56:15 -0000	1.5
+++ icons.cpp	24 Jun 2005 15:23:40 -0000	1.6
@@ -19,7 +19,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 
 #include "common/file.h"
 

Index: items.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/items.cpp,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -d -r1.120 -r1.121
--- items.cpp	6 May 2005 13:22:45 -0000	1.120
+++ items.cpp	24 Jun 2005 15:23:40 -0000	1.121
@@ -22,7 +22,7 @@
 // Item script opcodes for Simon1/Simon2
 #include <ctype.h>
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "simon/simon.h"
 #include "simon/intern.h"
 

Index: midi.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/midi.cpp,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- midi.cpp	10 May 2005 22:56:16 -0000	1.69
+++ midi.cpp	24 Jun 2005 15:23:40 -0000	1.70
@@ -20,7 +20,7 @@
  */
 
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "common/scummsys.h"
 #include "common/system.h"
 #include "common/file.h"

Index: midiparser_s1d.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/midiparser_s1d.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- midiparser_s1d.cpp	19 Apr 2005 06:25:35 -0000	1.11
+++ midiparser_s1d.cpp	24 Jun 2005 15:23:41 -0000	1.12
@@ -19,7 +19,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "sound/midiparser.h"
 #include "sound/mididrv.h"
 #include "common/util.h"

Index: res.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/res.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- res.cpp	10 May 2005 22:56:16 -0000	1.32
+++ res.cpp	24 Jun 2005 15:23:41 -0000	1.33
@@ -20,7 +20,7 @@
  */
 
 // Resource file routines for Simon1/Simon2
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "common/file.h"
 #include "simon/simon.h"
 #include "simon/intern.h"

Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/saveload.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- saveload.cpp	10 May 2005 23:17:36 -0000	1.11
+++ saveload.cpp	24 Jun 2005 15:23:41 -0000	1.12
@@ -19,7 +19,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 
 #include "gui/about.h"
 #include "gui/message.h"

Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.505
retrieving revision 1.506
diff -u -d -r1.505 -r1.506
--- simon.cpp	21 Jun 2005 22:08:19 -0000	1.505
+++ simon.cpp	24 Jun 2005 15:23:41 -0000	1.506
@@ -19,7 +19,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 
 #include "backends/fs/fs.h"
 

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/sound.cpp,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -d -r1.86 -r1.87
--- sound.cpp	11 May 2005 00:01:32 -0000	1.86
+++ sound.cpp	24 Jun 2005 15:23:42 -0000	1.87
@@ -17,7 +17,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 
 #include "common/file.h"
 #include "common/util.h"

Index: verb.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/verb.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- verb.cpp	6 May 2005 11:37:33 -0000	1.26
+++ verb.cpp	24 Jun 2005 15:23:42 -0000	1.27
@@ -20,7 +20,7 @@
  */
 
 // Verb and hitarea handling
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "simon/simon.h"
 #include "simon/intern.h"
 

Index: vga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/vga.cpp,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -d -r1.129 -r1.130
--- vga.cpp	8 May 2005 12:33:25 -0000	1.129
+++ vga.cpp	24 Jun 2005 15:23:42 -0000	1.130
@@ -20,7 +20,7 @@
  */
 
 // Video script opcodes for Simon1/Simon2
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "simon/simon.h"
 #include "simon/intern.h"
 #include "simon/vga.h"





More information about the Scummvm-git-logs mailing list