Removed RTTI except where required

(i.e. scummvm/scumm/mixer.cpp)

svn-id: r10420

5 files changed, 18 insertions, 5 deletions

diff --git a/bs2.dsp b/bs2.dsp
index d4f18caf6a..ba205cf06e 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 /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 BASE RSC /l 0x415 /d "_DEBUG"
 # ADD RSC /l 0x415 /d "_DEBUG"
 BSC32=bscmake.exe
diff --git a/scumm.dsp b/scumm.dsp
index 85f7c13506..8dcdba5b3d 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 /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 /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 BASE RSC /l 0x415 /d "_DEBUG"

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

 BSC32=bscmake.exe

diff --git a/scummvm.dsp b/scummvm.dsp
index 9cced2648c..15a3ae6205 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 /GR /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 /GR- /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

 # SUBTRACT CPP /Fr

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

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

@@ -307,6 +307,19 @@ SOURCE=.\sound\midiparser_xmidi.cpp
 # Begin Source File

 

 SOURCE=.\sound\mixer.cpp

+

+!IF  "$(CFG)" == "scummvm - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "scummvm - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "scummvm - Win32 mad mp3 Debug"

+

+# ADD CPP /GR

+

+!ELSEIF  "$(CFG)" == "scummvm - Win32 mad mp3 Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

diff --git a/simon.dsp b/simon.dsp
index df0fd2f664..5fe894b7fa 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 /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

 # 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 a87728ca25..e798a739b4 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 /GR- /GX /ZI /Od /I "." /I "common" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c

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

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

 BSC32=bscmake.exe