[Scummvm-cvs-logs] CVS: scummvm bs2.dsp,1.3,1.4 queen.dsp,1.1,1.2 scumm.dsp,1.53,1.54 scummvm.dsp,1.62,1.63 simon.dsp,1.24,1.25 sky.dsp,1.26,1.27

[Jamieson Christian]

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

Modified Files:
	bs2.dsp queen.dsp scumm.dsp scummvm.dsp simon.dsp sky.dsp 
Log Message:
Added MSVC6_COMPAT in order to be able to disable
new additions/optimizations that use constructs with
which MSVC6 is incompatible, such as the revamped
template-based super/hq/tv scalers.

Index: bs2.dsp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2.dsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- bs2.dsp	27 Sep 2003 02:33:17 -0000	1.3
+++ bs2.dsp	2 Oct 2003 15:00:31 -0000	1.4
@@ -89,7 +89,7 @@
 # PROP Intermediate_Dir "bs2___mad_mp3_Debug"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "." /I "common" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "BYPASS_COPY_PROT" /D "USE_ADLIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /WX /Gm /vmg /GR- /GX /ZI /Od /I "." /I "common" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "USE_ADLIB" /D "BYPASS_COPY_PROT" /D "USE_MAD" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /WX /Gm /vmg /GX /ZI /Od /I "." /I "common" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "USE_ADLIB" /D "BYPASS_COPY_PROT" /D "USE_MAD" /D "MSVC6_COMPAT" /YX /FD /GZ /c
 # ADD BASE RSC /l 0x415 /d "_DEBUG"
 # ADD RSC /l 0x415 /d "_DEBUG"
 BSC32=bscmake.exe

Index: queen.dsp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen.dsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- queen.dsp	29 Sep 2003 01:47:23 -0000	1.1
+++ queen.dsp	2 Oct 2003 15:00:32 -0000	1.2
@@ -89,7 +89,7 @@
 # PROP Intermediate_Dir "queen___mad_mp3_Debug"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "." /I "common" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "BYPASS_COPY_PROT" /D "USE_ADLIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /WX /Gm /vmg /GX /ZI /Od /I "." /I "common" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "USE_ADLIB" /D "BYPASS_COPY_PROT" /D "USE_MAD" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /WX /Gm /vmg /GX /ZI /Od /I "." /I "common" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "USE_ADLIB" /D "BYPASS_COPY_PROT" /D "USE_MAD" /D "MSVC6_COMPAT" /YX /FD /GZ /c
 # ADD BASE RSC /l 0x415 /d "_DEBUG"
 # ADD RSC /l 0x415 /d "_DEBUG"
 BSC32=bscmake.exe

Index: scumm.dsp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm.dsp,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- scumm.dsp	28 Sep 2003 00:10:13 -0000	1.53
+++ scumm.dsp	2 Oct 2003 15:00:32 -0000	1.54
@@ -89,7 +89,7 @@
 # PROP Intermediate_Dir "scumm___mad_mp3_Debug"

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "." /I "common" /I "scumm" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "BYPASS_COPY_PROT" /D "USE_ADLIB" /YX /FD /GZ /c

-# ADD CPP /nologo /MTd /W3 /WX /Gm /vmg /GX /ZI /Od /I "." /I "common" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "USE_ADLIB" /D "BYPASS_COPY_PROT" /D "USE_MAD" /YX /FD /GZ /c

+# ADD CPP /nologo /MTd /W3 /WX /Gm /vmg /GX /ZI /Od /I "." /I "common" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "USE_ADLIB" /D "BYPASS_COPY_PROT" /D "USE_MAD" /D "MSVC6_COMPAT" /YX /FD /GZ /c

 # ADD BASE RSC /l 0x415 /d "_DEBUG"

 # ADD RSC /l 0x415 /d "_DEBUG"

 BSC32=bscmake.exe


Index: scummvm.dsp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummvm.dsp,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- scummvm.dsp	30 Sep 2003 17:54:57 -0000	1.62
+++ scummvm.dsp	2 Oct 2003 15:00:32 -0000	1.63
@@ -98,7 +98,7 @@
 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /I "./sound" /I "./" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "ALLOW_GDI" /D "BYPASS_COPY_PROT" /D "USE_ADLIB" /D "USE_MAD" /Yu"stdafx.h" /FD /GZ /c

 # SUBTRACT BASE CPP /Fr

-# ADD CPP /nologo /MTd /W3 /WX /Gm /GX /ZI /Od /I "." /I "common" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "ALLOW_GDI" /D "USE_ADLIB" /D "BYPASS_COPY_PROT" /D "USE_MAD" /YX /FD /GZ /c

+# ADD CPP /nologo /MTd /W3 /WX /Gm /GX /ZI /Od /I "." /I "common" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "ALLOW_GDI" /D "USE_ADLIB" /D "BYPASS_COPY_PROT" /D "USE_MAD" /D "MSVC6_COMPAT" /YX /FD /GZ /c

 # SUBTRACT CPP /Fr

 # ADD BASE RSC /l 0x41d /d "_DEBUG"

 # ADD RSC /l 0x41d /d "_DEBUG"


Index: simon.dsp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon.dsp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- simon.dsp	27 Sep 2003 02:33:17 -0000	1.24
+++ simon.dsp	2 Oct 2003 15:00:34 -0000	1.25
@@ -89,7 +89,7 @@
 # PROP Intermediate_Dir "simon___mad_mp3_Debug"

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "BYPASS_COPY_PROT" /D "USE_ADLIB" /YX /FD /GZ /c

-# ADD CPP /nologo /MTd /W3 /WX /Gm /GR- /GX /ZI /Od /I "." /I "common" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "USE_ADLIB" /D "BYPASS_COPY_PROT" /D "USE_MAD" /FD /GZ /c

+# ADD CPP /nologo /MTd /W3 /WX /Gm /GX /ZI /Od /I "." /I "common" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "USE_ADLIB" /D "BYPASS_COPY_PROT" /D "USE_MAD" /D "MSVC6_COMPAT" /FD /GZ /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x415 /d "_DEBUG"

 # ADD RSC /l 0x415 /d "_DEBUG"


Index: sky.dsp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky.dsp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- sky.dsp	27 Sep 2003 02:33:17 -0000	1.26
+++ sky.dsp	2 Oct 2003 15:00:36 -0000	1.27
@@ -89,7 +89,7 @@
 # PROP Intermediate_Dir "sky___mad_mp3_Debug"

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /WX /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c

-# ADD CPP /nologo /MTd /W3 /WX /Gm /GR- /GX /ZI /Od /I "." /I "common" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c

+# ADD CPP /nologo /MTd /W3 /WX /Gm /GX /ZI /Od /I "." /I "common" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "MSVC6_COMPAT" /YX /FD /GZ /c

 # ADD BASE RSC /l 0x415 /d "_DEBUG"

 # ADD RSC /l 0x415 /d "_DEBUG"

 BSC32=bscmake.exe