[Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse.cpp,1.129,1.130 dimuse_music.cpp,1.40,1.41 dimuse_tables.cpp,1.20,1.21 dimuse_track.cpp,1.51,1.52

Chris Apers chrilith at users.sourceforge.net
Sat Oct 8 13:15:34 CEST 2005


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

Modified Files:
	dimuse.cpp dimuse_music.cpp dimuse_tables.cpp dimuse_track.cpp 
Log Message:
More DISABLE_SCUMM_7_8

Index: dimuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse.cpp,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -d -r1.129 -r1.130
--- dimuse.cpp	24 Jun 2005 15:23:20 -0000	1.129
+++ dimuse.cpp	8 Oct 2005 20:14:40 -0000	1.130
@@ -18,6 +18,8 @@
  * $Header$
  */
 
+#ifndef DISABLE_SCUMM_7_8
+
 #include "common/stdafx.h"
 #include "common/system.h"
 #include "common/timer.h"
@@ -409,3 +411,5 @@
 }
 
 } // End of namespace Scumm
+
+#endif

Index: dimuse_music.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_music.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- dimuse_music.cpp	19 Sep 2005 06:49:29 -0000	1.40
+++ dimuse_music.cpp	8 Oct 2005 20:14:40 -0000	1.41
@@ -18,6 +18,8 @@
  * $Header$
  */
 
+#ifndef DISABLE_SCUMM_7_8
+
 #include "common/stdafx.h"
 #include "common/scummsys.h"
 #include "scumm/scumm.h"
@@ -441,3 +443,5 @@
 
 
 } // End of namespace Scumm
+
+#endif

Index: dimuse_tables.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_tables.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- dimuse_tables.cpp	24 Jun 2005 15:23:21 -0000	1.20
+++ dimuse_tables.cpp	8 Oct 2005 20:14:40 -0000	1.21
@@ -18,12 +18,14 @@
  * $Header$
  */
 
+#ifndef DISABLE_SCUMM_7_8
+
 #include "common/stdafx.h"
 #include "scumm/imuse_digi/dimuse.h"
 
 namespace Scumm {
 
-#ifdef __PALM_OS__
+#ifdef PALMOS_68K
 const imuseRoomMap *_digStateMusicMap;
 const imuseDigTable *_digStateMusicTable;
 const imuseDigTable *_digSeqMusicTable;
@@ -852,7 +854,7 @@
 
 } // End of namespace Scumm
 
-#ifdef __PALM_OS__
+#ifdef PALMOS_68K
 #include "scumm_globals.h"
 
 _GINIT(DimuseTables)
@@ -878,3 +880,5 @@
 _GEND
 
 #endif
+
+#endif

Index: dimuse_track.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_track.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- dimuse_track.cpp	24 Jun 2005 15:23:22 -0000	1.51
+++ dimuse_track.cpp	8 Oct 2005 20:14:40 -0000	1.52
@@ -18,6 +18,8 @@
  * $Header$
  */
 
+#ifndef DISABLE_SCUMM_7_8
+
 #include "common/stdafx.h"
 #include "common/timer.h"
 
@@ -360,3 +362,5 @@
 }
 
 } // End of namespace Scumm
+
+#endif





More information about the Scummvm-git-logs mailing list