[Scummvm-cvs-logs] CVS: scummvm/scumm/smush chunk.cpp,1.35,1.36 codec1.cpp,1.16,1.17 codec37.cpp,1.29,1.30 codec47.cpp,1.70,1.71 imuse_channel.cpp,1.30,1.31 saud_channel.cpp,1.27,1.28 smush_font.cpp,1.29,1.30 smush_mixer.cpp,1.43,1.44 smush_mixer.h,1.16,1.17 smush_player.cpp,1.167,1.168

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


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

Modified Files:
	chunk.cpp codec1.cpp codec37.cpp codec47.cpp imuse_channel.cpp 
	saud_channel.cpp smush_font.cpp smush_mixer.cpp smush_mixer.h 
	smush_player.cpp 
Log Message:
When including files from common/, explicitly use the common/ prefix

Index: chunk.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/chunk.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- chunk.cpp	3 Apr 2005 06:27:43 -0000	1.35
+++ chunk.cpp	24 Jun 2005 15:23:23 -0000	1.36
@@ -19,7 +19,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "scumm/smush/chunk.h"
 #include "scumm/scumm.h"
 

Index: codec1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/codec1.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- codec1.cpp	17 Jun 2005 18:10:51 -0000	1.16
+++ codec1.cpp	24 Jun 2005 15:23:24 -0000	1.17
@@ -19,7 +19,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "common/scummsys.h"
 
 namespace Scumm {

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

Index: codec47.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/codec47.cpp,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- codec47.cpp	25 May 2005 09:17:35 -0000	1.70
+++ codec47.cpp	24 Jun 2005 15:23:26 -0000	1.71
@@ -19,7 +19,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "common/util.h"
 #include "scumm/bomp.h"
 #include "scumm/smush/codec47.h"

Index: imuse_channel.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/imuse_channel.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- imuse_channel.cpp	1 Jan 2005 16:09:19 -0000	1.30
+++ imuse_channel.cpp	24 Jun 2005 15:23:27 -0000	1.31
@@ -19,7 +19,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "scumm/scumm.h"
 #include "scumm/smush/channel.h"
 #include "scumm/smush/chunk.h"

Index: saud_channel.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/saud_channel.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- saud_channel.cpp	1 Jan 2005 16:09:19 -0000	1.27
+++ saud_channel.cpp	24 Jun 2005 15:23:27 -0000	1.28
@@ -19,7 +19,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 
 #include "scumm/smush/channel.h"
 #include "scumm/smush/chunk.h"

Index: smush_font.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_font.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- smush_font.cpp	15 May 2005 10:40:28 -0000	1.29
+++ smush_font.cpp	24 Jun 2005 15:23:27 -0000	1.30
@@ -19,7 +19,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "common/file.h"
 #include "scumm/scumm.h"
 #include "scumm/util.h"

Index: smush_mixer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_mixer.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- smush_mixer.cpp	10 May 2005 23:48:42 -0000	1.43
+++ smush_mixer.cpp	24 Jun 2005 15:23:27 -0000	1.44
@@ -19,7 +19,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "common/util.h"
 
 #include "scumm/smush/smush_mixer.h"

Index: smush_mixer.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_mixer.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- smush_mixer.h	11 May 2005 00:01:31 -0000	1.16
+++ smush_mixer.h	24 Jun 2005 15:23:27 -0000	1.17
@@ -22,7 +22,7 @@
 #ifndef SMUSH_MIXER_H
 #define SMUSH_MIXER_H
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "scumm/sound.h"
 
 namespace Scumm {

Index: smush_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_player.cpp,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -d -r1.167 -r1.168
--- smush_player.cpp	21 Jun 2005 22:08:18 -0000	1.167
+++ smush_player.cpp	24 Jun 2005 15:23:39 -0000	1.168
@@ -19,7 +19,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 
 #include "base/engine.h"
 





More information about the Scummvm-git-logs mailing list