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.

svn-id: r10540

7 files changed, 20 insertions, 9 deletions

diff --git a/bs2.dsp b/bs2.dsp
index ba205cf06e..53397b005e 100644
--- a/bs2.dsp
+++ b/bs2.dsp
@@ -89,7 +89,7 @@ LIB32=link.exe -lib
 # 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
diff --git a/common/scaler/intern.h b/common/scaler/intern.h
index daf76a0d11..982386e54e 100644
--- a/common/scaler/intern.h
+++ b/common/scaler/intern.h
@@ -35,6 +35,9 @@
 //
 #define USE_ALTIVEC	0
 
+// MSVC6 chokes on all but the most simplistic template usage.
+#ifndef MSVC6_COMPAT
+
 template<int bitFormat>
 struct ColorMasks {
 };
@@ -67,9 +70,6 @@ struct ColorMasks<555> {
 #define greenMask	ColorMasks<bitFormat>::greenMask
 
 
-extern int gBitFormat;
-
-
 /**
  * Interpolate two 16 bit pixel pairs at once with equal weights 1.
  * In particular, A and B can contain two pixels/each in the upper
@@ -171,4 +171,15 @@ extern int   RGBtoYUV[65536];
 			FUNC<555>(srcPtr, srcPitch, dstPtr, dstPitch, width, height); \
 	}
 
+#else // MSVC6_COMPAT is defined
+
+#define MAKE_WRAPPER(FUNC) \
+	void FUNC(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height) { \
+		return; \
+	}
+
+#endif
+
+extern int gBitFormat;
+
 #endif
diff --git a/queen.dsp b/queen.dsp
index 93895ecd86..dadf547b9b 100644
--- a/queen.dsp
+++ b/queen.dsp
@@ -89,7 +89,7 @@ LIB32=link.exe -lib
 # 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
diff --git a/scumm.dsp b/scumm.dsp
index 1155ff39c6..eb7543273d 100644
--- a/scumm.dsp
+++ b/scumm.dsp
@@ -89,7 +89,7 @@ LIB32=link.exe -lib
 # 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

diff --git a/scummvm.dsp b/scummvm.dsp
index e5c7c6866d..5fec6df30b 100644
--- a/scummvm.dsp
+++ b/scummvm.dsp
@@ -98,7 +98,7 @@ LINK32=link.exe
 # 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"

diff --git a/simon.dsp b/simon.dsp
index 5fe894b7fa..7d01b0ce3b 100644
--- a/simon.dsp
+++ b/simon.dsp
@@ -89,7 +89,7 @@ LIB32=link.exe -lib
 # 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"

diff --git a/sky.dsp b/sky.dsp
index e798a739b4..a68370623f 100644
--- a/sky.dsp
+++ b/sky.dsp
@@ -89,7 +89,7 @@ LIB32=link.exe -lib
 # 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