build with mad by default, added opengl build

svn-id: r8625

1 files changed, 20 insertions, 20 deletions

diff --git a/scumm.dsp b/scumm.dsp
index 35ffc03b49..3904828b23 100644
--- a/scumm.dsp
+++ b/scumm.dsp
@@ -4,7 +4,7 @@
 

 # TARGTYPE "Win32 (x86) Static Library" 0x0104

 

-CFG=scumm - Win32 MP3 Enabled Debug

+CFG=scumm - Win32 OpenGL Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,14 +13,14 @@ CFG=scumm - Win32 MP3 Enabled Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "scumm.mak" CFG="scumm - Win32 MP3 Enabled Debug"

+!MESSAGE NMAKE /f "scumm.mak" CFG="scumm - Win32 OpenGL Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

 !MESSAGE "scumm - Win32 Release" (based on "Win32 (x86) Static Library")

 !MESSAGE "scumm - Win32 Debug" (based on "Win32 (x86) Static Library")

-!MESSAGE "scumm - Win32 MP3 Enabled Debug" (based on "Win32 (x86) Static Library")

-!MESSAGE "scumm - Win32 MP3 Enabled Release" (based on "Win32 (x86) Static Library")

+!MESSAGE "scumm - Win32 OpenGL Debug" (based on "Win32 (x86) Static Library")

+!MESSAGE "scumm - Win32 OpenGL Release" (based on "Win32 (x86) Static Library")

 !MESSAGE 

 

 # Begin Project

@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "scumm___Release"

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c

-# ADD CPP /nologo /G6 /MT /W3 /WX /O2 /I "." /I "common" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "USE_ADLIB" /D "BYPASS_COPY_PROT" /YX /FD /c

+# ADD CPP /nologo /G6 /MT /W3 /WX /GR /GX /O2 /I "." /I "common" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "USE_ADLIB" /D "BYPASS_COPY_PROT" /D "USE_MAD" /YX /FD /c

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

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

 BSC32=bscmake.exe

@@ -66,7 +66,7 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "scumm___Debug"

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /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 "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 "BYPASS_COPY_PROT" /D "USE_ADLIB" /D "USE_MAD" /YX /FD /GZ /c

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

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

 BSC32=bscmake.exe

@@ -76,20 +76,20 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo

 # ADD LIB32 /nologo

 

-!ELSEIF  "$(CFG)" == "scumm - Win32 MP3 Enabled Debug"

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

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "scumm___Win32_MP3_Enabled_Debug"

-# PROP BASE Intermediate_Dir "scumm___Win32_MP3_Enabled_Debug"

+# PROP BASE Output_Dir "scumm___Win32_OpenGL_Debug"

+# PROP BASE Intermediate_Dir "scumm___Win32_OpenGL_Debug"

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "scumm___MP3_Enabled_Debug"

-# PROP Intermediate_Dir "scumm___MP3_Enabled_Debug"

+# PROP Output_Dir "scumm___OpenGL_Debug"

+# PROP Intermediate_Dir "scumm___OpenGL_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 /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 /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

@@ -99,20 +99,20 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo

 # ADD LIB32 /nologo

 

-!ELSEIF  "$(CFG)" == "scumm - Win32 MP3 Enabled Release"

+!ELSEIF  "$(CFG)" == "scumm - Win32 OpenGL Release"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "scumm___Win32_MP3_Enabled_Release"

-# PROP BASE Intermediate_Dir "scumm___Win32_MP3_Enabled_Release"

+# PROP BASE Output_Dir "scumm___Win32_OpenGL_Release"

+# PROP BASE Intermediate_Dir "scumm___Win32_OpenGL_Release"

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "scumm___MP3_Enabled_Release"

-# PROP Intermediate_Dir "scumm___MP3_Enabled_Release"

+# PROP Output_Dir "scumm___OpenGL_Release"

+# PROP Intermediate_Dir "scumm___OpenGL_Release"

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /I "." /I "common" /I "scumm" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "USE_ADLIB" /YX /FD /c

-# ADD CPP /nologo /G6 /MT /W3 /WX /GX /O2 /I "." /I "common" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "USE_ADLIB" /D "BYPASS_COPY_PROT" /D "USE_MAD" /YX /FD /c

+# ADD CPP /nologo /G6 /MT /W3 /WX /GR /GX /O2 /I "." /I "common" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "USE_ADLIB" /D "BYPASS_COPY_PROT" /D "USE_MAD" /YX /FD /c

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

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

 BSC32=bscmake.exe

@@ -128,8 +128,8 @@ LIB32=link.exe -lib
 

 # Name "scumm - Win32 Release"

 # Name "scumm - Win32 Debug"

-# Name "scumm - Win32 MP3 Enabled Debug"

-# Name "scumm - Win32 MP3 Enabled Release"

+# Name "scumm - Win32 OpenGL Debug"

+# Name "scumm - Win32 OpenGL Release"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"