Cleaned up and updated MSVC6 projects.

svn-id: r13643

5 files changed, 159 insertions, 29 deletions

diff --git a/dists/msvc6/bs1.dsp b/dists/msvc6/bs1.dsp
index a91a6ddc08..2aa5c1e8e9 100644
--- a/dists/msvc6/bs1.dsp
+++ b/dists/msvc6/bs1.dsp
@@ -4,7 +4,7 @@
 
 # TARGTYPE "Win32 (x86) Static Library" 0x0104
 
-CFG=bs1 - Win32 Debug
+CFG=bs1 - Win32 mad mp3 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,12 +13,14 @@ CFG=bs1 - Win32 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 "bs1.mak" CFG="bs1 - Win32 Debug"
+!MESSAGE NMAKE /f "bs1.mak" CFG="bs1 - Win32 mad mp3 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
 !MESSAGE "bs1 - Win32 Release" (based on "Win32 (x86) Static Library")
 !MESSAGE "bs1 - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "bs1 - Win32 mad mp3 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "bs1 - Win32 mad mp3 Release" (based on "Win32 (x86) Static Library")
 !MESSAGE 
 
 # Begin Project
@@ -43,8 +45,8 @@ RSC=rc.exe
 # 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 /GR /GX /O2 /I "." /I "common" /I "..\..\\" /I "..\..\common" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "USE_ADLIB" /D "BYPASS_COPY_PROT" /FD /c
 # SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
+# ADD BASE RSC /l 0x415 /d "NDEBUG"
+# ADD RSC /l 0x415 /d "NDEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -56,8 +58,8 @@ LIB32=link.exe -lib
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Output_Dir "bs1___Win32_Debug"
+# PROP BASE Intermediate_Dir "bs1___Win32_Debug"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
@@ -67,8 +69,56 @@ LIB32=link.exe -lib
 # 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 /GR /GX /ZI /Od /I "." /I "common" /I "..\..\\" /I "..\..\common" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "BYPASS_COPY_PROT" /D "USE_ADLIB" /FD /GZ /c
 # SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
+# ADD BASE RSC /l 0x415 /d "_DEBUG"
+# ADD RSC /l 0x415 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "bs1 - Win32 mad mp3 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "bs1___Win32_mad mp3_Debug"
+# PROP BASE Intermediate_Dir "bs1___Win32_mad mp3_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "bs1___mad_mp3_Debug"
+# PROP Intermediate_Dir "bs1___mad_mp3_Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "." /I "common" /I "bs1" /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" /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"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "bs1 - Win32 mad mp3 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "bs1___Win32_mad mp3_Release"
+# PROP BASE Intermediate_Dir "bs1___Win32_mad mp3_Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "bs1___mad_mp3_Release"
+# PROP Intermediate_Dir "bs1___mad_mp3_Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /I "." /I "common" /I "bs1" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "USE_ADLIB" /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" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x415 /d "NDEBUG"
+# ADD RSC /l 0x415 /d "NDEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -82,6 +132,8 @@ LIB32=link.exe -lib
 
 # Name "bs1 - Win32 Release"
 # Name "bs1 - Win32 Debug"
+# Name "bs1 - Win32 mad mp3 Debug"
+# Name "bs1 - Win32 mad mp3 Release"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
diff --git a/dists/msvc6/bs2.dsp b/dists/msvc6/bs2.dsp
index 884d0f8c92..c9bff36ec0 100644
--- a/dists/msvc6/bs2.dsp
+++ b/dists/msvc6/bs2.dsp
@@ -339,14 +339,6 @@ SOURCE=..\..\sword2\maketext.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\sword2\mem_view.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\sword2\mem_view.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\sword2\memory.cpp
 # End Source File
 # Begin Source File
diff --git a/dists/msvc6/scumm.dsp b/dists/msvc6/scumm.dsp
index 4caaa18969..2dfd7e19c9 100644
--- a/dists/msvc6/scumm.dsp
+++ b/dists/msvc6/scumm.dsp
@@ -238,6 +238,10 @@ SOURCE=..\..\scumm\imuse_digi\dimuse_music.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\scumm\imuse_digi\dimuse_script.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\scumm\imuse_digi\dimuse_sndmgr.cpp
 # End Source File
 # Begin Source File
@@ -248,6 +252,10 @@ SOURCE=..\..\scumm\imuse_digi\dimuse_sndmgr.h
 
 SOURCE=..\..\scumm\imuse_digi\dimuse_tables.cpp
 # End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\imuse_digi\dimuse_track.cpp
+# End Source File
 # End Group
 # Begin Group "insane"
 
@@ -523,11 +531,11 @@ SOURCE=..\..\scumm\script_v6he.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\scumm\script_v8.cpp
+SOURCE=..\..\scumm\script_v7he.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\scumm\scumm.h
+SOURCE=..\..\scumm\script_v8.cpp
 # End Source File
 # Begin Source File
 
@@ -535,6 +543,10 @@ SOURCE=..\..\scumm\scumm.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\scumm\scumm.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\scumm\sound.cpp
 # End Source File
 # Begin Source File
diff --git a/dists/msvc6/scummvm.dsp b/dists/msvc6/scummvm.dsp
index d45d914a42..b3bf8ffc1d 100644
--- a/dists/msvc6/scummvm.dsp
+++ b/dists/msvc6/scummvm.dsp
@@ -79,7 +79,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib sdl.lib winmm.lib wsock32.lib simon___Debug\simon.lib scumm___Debug\scumm.lib sky___Debug\sky.lib bs2___Debug\bs2.lib queen___Debug\queen.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc" /pdbtype:sept /fixed:no
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib sdl.lib winmm.lib wsock32.lib simon___Debug\simon.lib scumm___Debug\scumm.lib sky___Debug\sky.lib bs2___Debug\bs2.lib queen___Debug\queen.lib saga___Debug\saga.lib kyra___Debug\kyra.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc" /pdbtype:sept /fixed:no
 # SUBTRACT LINK32 /pdb:none
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 mad mp3 Debug"
@@ -107,7 +107,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib sdl.lib winmm.lib libmad.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib sdl.lib winmm.lib libmad.lib wsock32.lib scumm___mad_mp3_Debug\scumm.lib simon___mad_mp3_Debug\simon.lib sky___mad_mp3_Debug\sky.lib bs2___mad_mp3_Debug\bs2.lib queen___mad_mp3_Debug\queen.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc" /nodefaultlib:"libcd" /pdbtype:sept /fixed:no
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib sdl.lib winmm.lib libmad.lib wsock32.lib scumm___mad_mp3_Debug\scumm.lib simon___mad_mp3_Debug\simon.lib sky___mad_mp3_Debug\sky.lib bs2___mad_mp3_Debug\bs2.lib queen___mad_mp3_Debug\queen.lib saga___mad_mp3_Debug\saga.lib kyra___mad_mp3_Debug\kyra.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc" /nodefaultlib:"libcd" /pdbtype:sept /fixed:no
 # SUBTRACT LINK32 /pdb:none /map
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 mad mp3 Release"
@@ -135,7 +135,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib sdl.lib winmm.lib wsock32.lib libmad.lib simon___Release\simon.lib scumm___Release\scumm.lib sdl.lib /nologo /subsystem:console /machine:I386 /nodefaultlib
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib sdl.lib winmm.lib wsock32.lib libmad.lib scumm___mad_mp3_Release\scumm.lib simon___mad_mp3_Release\simon.lib sky___mad_mp3_Release\sky.lib bs2___mad_mp3_Release\bs2.lib queen___mad_mp3_Release\queen.lib /nologo /subsystem:console /pdb:none /machine:I386 /nodefaultlib:"libc" /nodefaultlib:"libcd"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib sdl.lib winmm.lib wsock32.lib libmad.lib scumm___mad_mp3_Release\scumm.lib simon___mad_mp3_Release\simon.lib sky___mad_mp3_Release\sky.lib bs2___mad_mp3_Release\bs2.lib queen___mad_mp3_Release\queen.lib saga___mad_mp3_Release\saga.lib kyra___mad_mp3_Release\kyra.lib bs1___mad_mp3_Release\bs1.lib /nologo /subsystem:console /pdb:none /machine:I386 /nodefaultlib:"libc" /nodefaultlib:"libcd"
 # SUBTRACT LINK32 /debug
 
 !ENDIF 
@@ -282,6 +282,14 @@ SOURCE=..\..\common\str.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\common\stream.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\common\stream.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\common\system.cpp
 # End Source File
 # Begin Source File
@@ -542,7 +550,11 @@ SOURCE=..\..\gui\widget.h
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE="..\..\backends\sdl\sdl-common.cpp"
+SOURCE=..\..\backends\sdl\events.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\backends\sdl\graphics.cpp
 # End Source File
 # Begin Source File
 
@@ -586,6 +598,38 @@ SOURCE=..\..\backends\midi\ym2612.cpp
 # End Source File
 # End Group
 # End Group
+# Begin Group "graphics"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\graphics\animation.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\graphics\animation.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\graphics\font.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\graphics\font.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\graphics\newfont.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\graphics\scummfont.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\graphics\surface.h
+# End Source File
+# End Group
 # End Group
 # Begin Source File
 
diff --git a/dists/msvc6/scummvm.dsw b/dists/msvc6/scummvm.dsw
index a5a2d865f8..da337e7dcc 100644
--- a/dists/msvc6/scummvm.dsw
+++ b/dists/msvc6/scummvm.dsw
@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 
 ###############################################################################
 
-Project: "bs1"=.\bs1.dsp - Package Owner=<4>
+Project: "bs1"=".\bs1.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -15,7 +15,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "bs2"=.\bs2.dsp - Package Owner=<4>
+Project: "bs2"=".\bs2.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -27,7 +27,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "queen"=.\queen.dsp - Package Owner=<4>
+Project: "kyra"=".\kyra.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -39,7 +39,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "scumm"=.\scumm.dsp - Package Owner=<4>
+Project: "queen"=".\queen.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -51,7 +51,31 @@ Package=<4>
 
 ###############################################################################
 
-Project: "scummvm"=.\scummvm.dsp - Package Owner=<4>
+Project: "saga"=".\saga.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "scumm"=".\scumm.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "scummvm"=".\scummvm.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -77,11 +101,17 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name bs1
     End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name kyra
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name saga
+    End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "simon"=.\simon.dsp - Package Owner=<4>
+Project: "simon"=".\simon.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -93,7 +123,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "sky"=.\sky.dsp - Package Owner=<4>
+Project: "sky"=".\sky.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{