moved msvc6 and msvc7 project files into dist dir

svn-id: r10563

16 files changed, 3206 insertions, 3180 deletions

diff --git a/bs2.dsp b/dists/msvc6/bs2.dsp
index 53397b005e..f46639a51c 100644
--- a/bs2.dsp
+++ b/dists/msvc6/bs2.dsp
@@ -43,7 +43,8 @@ RSC=rc.exe
 # PROP Intermediate_Dir "bs2___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 /GR /GX /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" /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 0x415 /d "NDEBUG"
 # ADD RSC /l 0x415 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -66,7 +67,8 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "bs2___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 /GR /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" /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 0x415 /d "_DEBUG"
 # ADD RSC /l 0x415 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -89,7 +91,8 @@ 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 /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 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
@@ -112,7 +115,8 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "bs2___mad_mp3_Release"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /I "." /I "common" /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" /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
@@ -138,332 +142,332 @@ LIB32=link.exe -lib
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\bs2\driver\_console.cpp
+SOURCE=..\..\bs2\driver\_console.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\driver\_console.h
+SOURCE=..\..\bs2\driver\_console.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\driver\_mouse.cpp
+SOURCE=..\..\bs2\driver\_mouse.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\driver\_mouse.h
+SOURCE=..\..\bs2\driver\_mouse.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\driver\d_draw.cpp
+SOURCE=..\..\bs2\driver\d_draw.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\driver\d_draw.h
+SOURCE=..\..\bs2\driver\d_draw.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\driver\d_sound.cpp
+SOURCE=..\..\bs2\driver\d_sound.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\driver\d_sound.h
+SOURCE=..\..\bs2\driver\d_sound.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\driver\ddutil.h
+SOURCE=..\..\bs2\driver\ddutil.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\driver\driver96.h
+SOURCE=..\..\bs2\driver\driver96.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\driver\keyboard.cpp
+SOURCE=..\..\bs2\driver\keyboard.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\driver\keyboard.h
+SOURCE=..\..\bs2\driver\keyboard.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\driver\language.cpp
+SOURCE=..\..\bs2\driver\language.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\driver\menu.cpp
+SOURCE=..\..\bs2\driver\menu.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\driver\menu.h
+SOURCE=..\..\bs2\driver\menu.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\driver\misc.cpp
+SOURCE=..\..\bs2\driver\misc.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\driver\mouse.h
+SOURCE=..\..\bs2\driver\mouse.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\driver\palette.cpp
+SOURCE=..\..\bs2\driver\palette.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\driver\palette.h
+SOURCE=..\..\bs2\driver\palette.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\driver\rdwin.cpp
+SOURCE=..\..\bs2\driver\rdwin.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\driver\rdwin.h
+SOURCE=..\..\bs2\driver\rdwin.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\driver\render.cpp
+SOURCE=..\..\bs2\driver\render.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\driver\render.h
+SOURCE=..\..\bs2\driver\render.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\driver\sprite.cpp
+SOURCE=..\..\bs2\driver\sprite.cpp
 # End Source File
 # End Group
 # Begin Source File
 
-SOURCE=.\bs2\anims.cpp
+SOURCE=..\..\bs2\anims.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\anims.h
+SOURCE=..\..\bs2\anims.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\build_display.cpp
+SOURCE=..\..\bs2\build_display.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\build_display.h
+SOURCE=..\..\bs2\build_display.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\console.cpp
+SOURCE=..\..\bs2\console.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\console.h
+SOURCE=..\..\bs2\console.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\controls.cpp
+SOURCE=..\..\bs2\controls.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\controls.h
+SOURCE=..\..\bs2\controls.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\credits.h
+SOURCE=..\..\bs2\credits.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\debug.cpp
+SOURCE=..\..\bs2\debug.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\debug.h
+SOURCE=..\..\bs2\debug.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\defs.h
+SOURCE=..\..\bs2\defs.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\events.cpp
+SOURCE=..\..\bs2\events.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\events.h
+SOURCE=..\..\bs2\events.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\function.cpp
+SOURCE=..\..\bs2\function.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\function.h
+SOURCE=..\..\bs2\function.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\header.h
+SOURCE=..\..\bs2\header.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\icons.cpp
+SOURCE=..\..\bs2\icons.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\icons.h
+SOURCE=..\..\bs2\icons.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\interpreter.cpp
+SOURCE=..\..\bs2\interpreter.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\interpreter.h
+SOURCE=..\..\bs2\interpreter.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\layers.cpp
+SOURCE=..\..\bs2\layers.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\layers.h
+SOURCE=..\..\bs2\layers.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\logic.cpp
+SOURCE=..\..\bs2\logic.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\logic.h
+SOURCE=..\..\bs2\logic.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\maketext.cpp
+SOURCE=..\..\bs2\maketext.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\maketext.h
+SOURCE=..\..\bs2\maketext.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\mem_view.cpp
+SOURCE=..\..\bs2\mem_view.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\mem_view.h
+SOURCE=..\..\bs2\mem_view.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\memory.cpp
+SOURCE=..\..\bs2\memory.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\memory.h
+SOURCE=..\..\bs2\memory.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\mouse.cpp
+SOURCE=..\..\bs2\mouse.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\mouse.h
+SOURCE=..\..\bs2\mouse.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\object.h
+SOURCE=..\..\bs2\object.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\protocol.cpp
+SOURCE=..\..\bs2\protocol.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\protocol.h
+SOURCE=..\..\bs2\protocol.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\resman.cpp
+SOURCE=..\..\bs2\resman.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\resman.h
+SOURCE=..\..\bs2\resman.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\router.cpp
+SOURCE=..\..\bs2\router.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\router.h
+SOURCE=..\..\bs2\router.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\save_rest.cpp
+SOURCE=..\..\bs2\save_rest.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\save_rest.h
+SOURCE=..\..\bs2\save_rest.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\scroll.cpp
+SOURCE=..\..\bs2\scroll.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\scroll.h
+SOURCE=..\..\bs2\scroll.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\sound.cpp
+SOURCE=..\..\bs2\sound.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\sound.h
+SOURCE=..\..\bs2\sound.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\speech.cpp
+SOURCE=..\..\bs2\speech.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\speech.h
+SOURCE=..\..\bs2\speech.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\startup.cpp
+SOURCE=..\..\bs2\startup.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\startup.h
+SOURCE=..\..\bs2\startup.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\sword2.cpp
+SOURCE=..\..\bs2\sword2.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\sword2.h
+SOURCE=..\..\bs2\sword2.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\sync.cpp
+SOURCE=..\..\bs2\sync.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\sync.h
+SOURCE=..\..\bs2\sync.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\tony_gsdk.cpp
+SOURCE=..\..\bs2\tony_gsdk.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\tony_gsdk.h
+SOURCE=..\..\bs2\tony_gsdk.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\walker.cpp
+SOURCE=..\..\bs2\walker.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\bs2\walker.h
+SOURCE=..\..\bs2\walker.h
 # End Source File
 # End Group
 # End Target
diff --git a/queen.dsp b/dists/msvc6/queen.dsp
index dadf547b9b..692c49f2d3 100644
--- a/queen.dsp
+++ b/dists/msvc6/queen.dsp
@@ -43,7 +43,8 @@ RSC=rc.exe
 # PROP Intermediate_Dir "queen___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 /GR /GX /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" /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 0x415 /d "NDEBUG"
 # ADD RSC /l 0x415 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -66,7 +67,8 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "queen___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 /GR /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" /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 0x415 /d "_DEBUG"
 # ADD RSC /l 0x415 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -89,7 +91,8 @@ 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" /D "MSVC6_COMPAT" /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
@@ -112,7 +115,8 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "queen___mad_mp3_Release"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /I "." /I "common" /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" /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
@@ -135,35 +139,35 @@ LIB32=link.exe -lib
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\queen\logic.cpp
+SOURCE=..\..\queen\logic.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\queen\logic.h
+SOURCE=..\..\queen\logic.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\queen\queen.cpp
+SOURCE=..\..\queen\queen.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\queen\queen.h
+SOURCE=..\..\queen\queen.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\queen\resource.cpp
+SOURCE=..\..\queen\resource.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\queen\resource.h
+SOURCE=..\..\queen\resource.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\queen\restables.cpp
+SOURCE=..\..\queen\restables.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\queen\version.cpp
+SOURCE=..\..\queen\version.cpp
 # End Source File
 # End Group
 # End Target
diff --git a/scumm.dsp b/dists/msvc6/scumm.dsp
index eb7543273d..a796519aff 100644
--- a/scumm.dsp
+++ b/dists/msvc6/scumm.dsp
@@ -1,502 +1,506 @@
-# Microsoft Developer Studio Project File - Name="scumm" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

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

-

-CFG=scumm - 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 

-!MESSAGE NMAKE /f "scumm.mak".

-!MESSAGE 

-!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 mad mp3 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 mad mp3 Debug" (based on "Win32 (x86) Static Library")

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

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "scumm - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "scumm___Release"

-# 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 /GR /GX /O2 /I "." /I "common" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "USE_ADLIB" /D "BYPASS_COPY_PROT" /YX /FD /c

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo

-

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

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "scumm___Win32_Debug"

-# PROP BASE Intermediate_Dir "scumm___Win32_Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "scumm___Debug"

-# 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 /GR /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 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)" == "scumm - Win32 mad mp3 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "scumm___Win32_mad mp3_Debug"

-# PROP BASE Intermediate_Dir "scumm___Win32_mad mp3_Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "scumm___mad_mp3_Debug"

-# 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" /D "MSVC6_COMPAT" /YX /FD /GZ /c

-# 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)" == "scumm - Win32 mad mp3 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "scumm___Win32_mad mp3_Release"

-# PROP BASE Intermediate_Dir "scumm___Win32_mad mp3_Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "scumm___mad_mp3_Release"

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

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo

-

-!ENDIF 

-

-# Begin Target

-

-# Name "scumm - Win32 Release"

-# Name "scumm - Win32 Debug"

-# Name "scumm - Win32 mad mp3 Debug"

-# Name "scumm - Win32 mad mp3 Release"

-# Begin Group "Source Files"

-

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

-# Begin Group "smush"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\scumm\smush\channel.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\smush\chunk.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\smush\chunk.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\smush\chunk_type.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\smush\codec1.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\smush\codec37.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\smush\codec37.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\smush\codec47.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\smush\codec47.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\smush\imuse_channel.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\smush\saud_channel.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\smush\smush_font.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\smush\smush_font.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\smush\smush_mixer.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\smush\smush_mixer.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\smush\smush_player.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\smush\smush_player.h

-# End Source File

-# End Group

-# Begin Source File

-

-SOURCE=.\scumm\actor.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\actor.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\akos.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\akos.h

-# End Source File

-# Begin Source File

-

-SOURCE=".\scumm\base-costume.cpp"

-# End Source File

-# Begin Source File

-

-SOURCE=".\scumm\base-costume.h"

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\bomp.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\bomp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\boxes.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\boxes.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\bundle.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\bundle.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\camera.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\charset.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\charset.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\costume.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\costume.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\debugger.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\debugger.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\dialogs.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\dialogs.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\gfx.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\gfx.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\help.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\help.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\imuse.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\imuse.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\imuse_digi.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\imuse_digi.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\imuse_internal.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\imuse_player.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\instrument.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\instrument.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\intern.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\midiparser_eup.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\midiparser_ro.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\music.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\nut_renderer.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\nut_renderer.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\object.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\object.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\player_mod.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\player_mod.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\player_v1.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\player_v1.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\player_v2.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\player_v2.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\player_v2a.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\player_v2a.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\player_v3a.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\player_v3a.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\resource.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\resource.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\resource_v2.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\resource_v3.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\resource_v4.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\saveload.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\saveload.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\script.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\script_v2.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\script_v5.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\script_v6.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\script_v8.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\scumm.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\scummvm.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\sound.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\sound.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\string.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\usage_bits.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\usage_bits.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\vars.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\verbs.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\scumm\verbs.h

-# End Source File

-# End Group

-# End Target

-# End Project

+# Microsoft Developer Studio Project File - Name="scumm" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=scumm - 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 
+!MESSAGE NMAKE /f "scumm.mak".
+!MESSAGE 
+!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 mad mp3 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 mad mp3 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "scumm - Win32 mad mp3 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "scumm - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "scumm___Release"
+# 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 /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 0x415 /d "NDEBUG"
+# ADD RSC /l 0x415 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "scumm - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "scumm___Win32_Debug"
+# PROP BASE Intermediate_Dir "scumm___Win32_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "scumm___Debug"
+# 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 /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 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)" == "scumm - Win32 mad mp3 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "scumm___Win32_mad mp3_Debug"
+# PROP BASE Intermediate_Dir "scumm___Win32_mad mp3_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "scumm___mad_mp3_Debug"
+# 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" /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)" == "scumm - Win32 mad mp3 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "scumm___Win32_mad mp3_Release"
+# PROP BASE Intermediate_Dir "scumm___Win32_mad mp3_Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "scumm___mad_mp3_Release"
+# PROP Intermediate_Dir "scumm___mad_mp3_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 /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
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "scumm - Win32 Release"
+# Name "scumm - Win32 Debug"
+# Name "scumm - Win32 mad mp3 Debug"
+# Name "scumm - Win32 mad mp3 Release"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Group "smush"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\scumm\smush\channel.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\smush\chunk.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\smush\chunk.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\smush\chunk_type.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\smush\codec1.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\smush\codec37.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\smush\codec37.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\smush\codec47.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\smush\codec47.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\smush\imuse_channel.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\smush\saud_channel.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\smush\smush_font.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\smush\smush_font.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\smush\smush_mixer.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\smush\smush_mixer.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\smush\smush_player.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\smush\smush_player.h
+# End Source File
+# End Group
+# Begin Source File
+
+SOURCE=..\..\scumm\actor.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\actor.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\akos.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\akos.h
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\scumm\base-costume.cpp"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\scumm\base-costume.h"
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\bomp.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\bomp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\boxes.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\boxes.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\bundle.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\bundle.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\camera.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\charset.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\charset.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\costume.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\costume.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\debugger.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\debugger.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\dialogs.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\dialogs.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\gfx.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\gfx.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\help.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\help.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\imuse.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\imuse.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\imuse_digi.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\imuse_digi.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\imuse_internal.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\imuse_player.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\instrument.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\instrument.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\intern.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\midiparser_eup.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\midiparser_ro.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\music.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\nut_renderer.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\nut_renderer.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\object.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\object.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\player_mod.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\player_mod.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\player_v1.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\player_v1.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\player_v2.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\player_v2.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\player_v2a.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\player_v2a.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\player_v3a.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\player_v3a.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\resource.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\resource.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\resource_v2.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\resource_v3.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\resource_v4.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\saveload.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\saveload.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\script.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\script_v2.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\script_v5.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\script_v6.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\script_v8.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\scumm.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\scummvm.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\sound.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\sound.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\string.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\usage_bits.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\usage_bits.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\vars.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\verbs.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scumm\verbs.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/scummvm.dsp b/dists/msvc6/scummvm.dsp
index 5fec6df30b..d708117110 100644
--- a/scummvm.dsp
+++ b/dists/msvc6/scummvm.dsp
@@ -1,559 +1,563 @@
-# Microsoft Developer Studio Project File - Name="scummvm" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=scummvm - 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 

-!MESSAGE NMAKE /f "scummvm.mak".

-!MESSAGE 

-!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 "scummvm.mak" CFG="scummvm - Win32 mad mp3 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "scummvm - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "scummvm - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "scummvm - Win32 mad mp3 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "scummvm - Win32 mad mp3 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

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

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "scummvm___Release"

-# PROP Intermediate_Dir "scummvm___Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c

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

-# SUBTRACT CPP /YX /Yc /Yu

-# ADD BASE RSC /l 0x41d /d "NDEBUG"

-# ADD RSC /l 0x41d /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# 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 /machine:I386

-# ADD LINK32 kernel32.lib user32.lib gdi32.lib sdl.lib winmm.lib wsock32.lib simon___Release\simon.lib scumm___Release\scumm.lib sky___Release\sky.lib bs2___Release\bs2.lib queen___Release\queen.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc"

-# SUBTRACT LINK32 /pdb:none

-

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

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "scummvm___Debug"

-# PROP Intermediate_Dir "scummvm___Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /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 "BYPASS_COPY_PROT" /YX /FD /GZ /c

-# SUBTRACT CPP /Fr

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# 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

-# SUBTRACT LINK32 /pdb:none

-

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

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "scummvm___Win32_mad mp3_Debug"

-# PROP BASE Intermediate_Dir "scummvm___Win32_mad mp3_Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "scummvm___mad_mp3_Debug"

-# PROP Intermediate_Dir "scummvm___mad_mp3_Debug"

-# PROP Ignore_Export_Lib 0

-# 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" /D "MSVC6_COMPAT" /YX /FD /GZ /c

-# SUBTRACT CPP /Fr

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# 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

-# SUBTRACT LINK32 /pdb:none /map

-

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

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "scummvm___Win32_mad mp3_Release"

-# PROP BASE Intermediate_Dir "scummvm___Win32_mad mp3_Release"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "scummvm___mad_mp3_Release"

-# PROP Intermediate_Dir "scummvm___mad_mp3_Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /G6 /MD /W3 /O2 /Ob2 /I "." /I "common" /I "scumm" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "USE_ADLIB" /D "USE_MAD" /FD /c

-# SUBTRACT BASE CPP /YX /Yc /Yu

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

-# SUBTRACT CPP /YX /Yc /Yu

-# ADD BASE RSC /l 0x41d /d "NDEBUG"

-# ADD RSC /l 0x41d /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# 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"

-# SUBTRACT LINK32 /debug

-

-!ENDIF 

-

-# Begin Target

-

-# Name "scummvm - Win32 Release"

-# Name "scummvm - Win32 Debug"

-# Name "scummvm - Win32 mad mp3 Debug"

-# Name "scummvm - Win32 mad mp3 Release"

-# Begin Group "Source Files"

-

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

-# Begin Group "base"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\base\engine.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\base\engine.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\base\gameDetector.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\base\gameDetector.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\base\main.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\base\plugins.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\base\plugins.h

-# End Source File

-# End Group

-# Begin Group "common"

-

-# PROP Default_Filter ""

-# Begin Group "scaler"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\common\scaler\2xsai.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\common\scaler\aspect.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\common\scaler\hq2x.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\common\scaler\hq3x.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\common\scaler\intern.h

-# End Source File

-# End Group

-# Begin Source File

-

-SOURCE=".\common\config-file.cpp"

-# End Source File

-# Begin Source File

-

-SOURCE=".\common\config-file.h"

-# End Source File

-# Begin Source File

-

-SOURCE=.\common\file.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\common\file.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\common\list.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\common\map.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\common\rect.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\common\savefile.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\common\savefile.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\common\scaler.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\common\scaler.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\common\scummsys.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\common\stdafx.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\common\str.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\common\str.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\common\system.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\common\timer.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\common\timer.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\common\util.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\common\util.h

-# End Source File

-# End Group

-# Begin Group "sound"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\sound\audiostream.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\sound\audiostream.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sound\fmopl.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\sound\fmopl.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sound\mididrv.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sound\midiparser.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\sound\midiparser.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sound\midiparser_smf.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\sound\midiparser_xmidi.cpp

-# End Source File

-# 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

-

-SOURCE=.\sound\mixer.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sound\mpu401.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\sound\mpu401.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sound\rate.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\sound\rate.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sound\voc.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\sound\voc.h

-# End Source File

-# End Group

-# Begin Group "gui"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\gui\about.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\gui\about.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\gui\browser.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\gui\browser.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\gui\chooser.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\gui\chooser.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\gui\console.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\gui\console.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\gui\dialog.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\gui\dialog.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\gui\EditTextWidget.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\gui\EditTextWidget.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\gui\launcher.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\gui\launcher.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\gui\ListWidget.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\gui\ListWidget.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\gui\message.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\gui\message.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\gui\newgui.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\gui\newgui.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\gui\options.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\gui\options.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\gui\PopUpWidget.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\gui\PopUpWidget.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\gui\ScrollBarWidget.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\gui\ScrollBarWidget.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\gui\widget.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\gui\widget.h

-# End Source File

-# End Group

-# Begin Group "backends"

-

-# PROP Default_Filter ""

-# Begin Group "sdl"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=".\backends\sdl\sdl-common.cpp"

-# End Source File

-# Begin Source File

-

-SOURCE=".\backends\sdl\sdl-common.h"

-# End Source File

-# Begin Source File

-

-SOURCE=.\backends\sdl\sdl.cpp

-# End Source File

-# End Group

-# Begin Group "fs"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\backends\fs\fs.h

-# End Source File

-# Begin Source File

-

-SOURCE=".\backends\fs\windows\windows-fs.cpp"

-# End Source File

-# End Group

-# Begin Group "midi"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\backends\midi\adlib.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\backends\midi\null.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\backends\midi\windows.cpp

-# End Source File

-# End Group

-# End Group

-# End Group

-# Begin Source File

-

-SOURCE=.\NEWS

-# End Source File

-# Begin Source File

-

-SOURCE=.\README

-# End Source File

-# Begin Source File

-

-SOURCE=.\scummvm.ico

-# End Source File

-# Begin Source File

-

-SOURCE=.\scummvm.rc

-# End Source File

-# End Target

-# End Project

+# Microsoft Developer Studio Project File - Name="scummvm" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=scummvm - 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 
+!MESSAGE NMAKE /f "scummvm.mak".
+!MESSAGE 
+!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 "scummvm.mak" CFG="scummvm - Win32 mad mp3 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "scummvm - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "scummvm - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "scummvm - Win32 mad mp3 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "scummvm - Win32 mad mp3 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "scummvm - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "scummvm___Release"
+# PROP Intermediate_Dir "scummvm___Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c
+# ADD CPP /nologo /G6 /MT /W3 /WX /GR /GX /O2 /Ob2 /I "." /I "common" /I "..\..\\" /I "..\..\common" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "USE_ADLIB" /D "BYPASS_COPY_PROT" /FD /c
+# SUBTRACT CPP /YX /Yc /Yu
+# ADD BASE RSC /l 0x41d /d "NDEBUG"
+# ADD RSC /l 0x41d /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# 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 /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib sdl.lib winmm.lib wsock32.lib simon___Release\simon.lib scumm___Release\scumm.lib sky___Release\sky.lib bs2___Release\bs2.lib queen___Release\queen.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc"
+# SUBTRACT LINK32 /pdb:none
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "scummvm___Debug"
+# PROP Intermediate_Dir "scummvm___Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /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 "_CONSOLE" /D "_MBCS" /D "ALLOW_GDI" /D "BYPASS_COPY_PROT" /FD /GZ /c
+# SUBTRACT CPP /Fr /YX
+# ADD BASE RSC /l 0x41d /d "_DEBUG"
+# ADD RSC /l 0x41d /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# 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
+# SUBTRACT LINK32 /pdb:none
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 mad mp3 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "scummvm___Win32_mad mp3_Debug"
+# PROP BASE Intermediate_Dir "scummvm___Win32_mad mp3_Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "scummvm___mad_mp3_Debug"
+# PROP Intermediate_Dir "scummvm___mad_mp3_Debug"
+# PROP Ignore_Export_Lib 0
+# 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" /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" /FD /GZ /c
+# SUBTRACT CPP /Fr /YX
+# ADD BASE RSC /l 0x41d /d "_DEBUG"
+# ADD RSC /l 0x41d /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# 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
+# SUBTRACT LINK32 /pdb:none /map
+
+!ELSEIF  "$(CFG)" == "scummvm - Win32 mad mp3 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "scummvm___Win32_mad mp3_Release"
+# PROP BASE Intermediate_Dir "scummvm___Win32_mad mp3_Release"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "scummvm___mad_mp3_Release"
+# PROP Intermediate_Dir "scummvm___mad_mp3_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /G6 /MD /W3 /O2 /Ob2 /I "." /I "common" /I "scumm" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "USE_ADLIB" /D "USE_MAD" /FD /c
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# ADD CPP /nologo /G6 /MT /W3 /WX /GR /GX /O2 /Ob2 /I "..\..\\" /I "..\..\common" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "USE_ADLIB" /D "BYPASS_COPY_PROT" /D "USE_MAD" /FD /c
+# SUBTRACT CPP /YX /Yc /Yu
+# ADD BASE RSC /l 0x41d /d "NDEBUG"
+# ADD RSC /l 0x41d /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# 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"
+# SUBTRACT LINK32 /debug
+
+!ENDIF 
+
+# Begin Target
+
+# Name "scummvm - Win32 Release"
+# Name "scummvm - Win32 Debug"
+# Name "scummvm - Win32 mad mp3 Debug"
+# Name "scummvm - Win32 mad mp3 Release"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Group "base"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\base\engine.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\base\engine.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\base\gameDetector.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\base\gameDetector.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\base\main.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\base\plugins.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\base\plugins.h
+# End Source File
+# End Group
+# Begin Group "common"
+
+# PROP Default_Filter ""
+# Begin Group "scaler"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\common\scaler\2xsai.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\common\scaler\aspect.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\common\scaler\hq2x.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\common\scaler\hq3x.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\common\scaler\intern.h
+# End Source File
+# End Group
+# Begin Source File
+
+SOURCE="..\..\common\config-file.cpp"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\common\config-file.h"
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\common\file.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\common\file.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\common\list.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\common\map.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\common\rect.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\common\savefile.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\common\savefile.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\common\scaler.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\common\scaler.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\common\scummsys.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\common\stdafx.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\common\str.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\common\str.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\common\system.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\common\timer.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\common\timer.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\common\util.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\common\util.h
+# End Source File
+# End Group
+# Begin Group "sound"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\sound\audiostream.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sound\audiostream.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sound\fmopl.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sound\fmopl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sound\mididrv.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sound\mididrv.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sound\midiparser.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sound\midiparser.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sound\midiparser_smf.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sound\midiparser_xmidi.cpp
+# End Source File
+# 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
+
+SOURCE=..\..\sound\mixer.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sound\mpu401.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sound\mpu401.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sound\rate.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sound\rate.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sound\voc.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sound\voc.h
+# End Source File
+# End Group
+# Begin Group "gui"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\gui\about.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\gui\about.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\gui\browser.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\gui\browser.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\gui\chooser.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\gui\chooser.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\gui\console.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\gui\console.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\gui\dialog.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\gui\dialog.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\gui\EditTextWidget.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\gui\EditTextWidget.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\gui\launcher.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\gui\launcher.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\gui\ListWidget.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\gui\ListWidget.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\gui\message.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\gui\message.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\gui\newgui.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\gui\newgui.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\gui\options.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\gui\options.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\gui\PopUpWidget.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\gui\PopUpWidget.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\gui\ScrollBarWidget.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\gui\ScrollBarWidget.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\gui\widget.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\gui\widget.h
+# End Source File
+# End Group
+# Begin Group "backends"
+
+# PROP Default_Filter ""
+# Begin Group "sdl"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE="..\..\backends\sdl\sdl-common.cpp"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\backends\sdl\sdl-common.h"
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\backends\sdl\sdl.cpp
+# End Source File
+# End Group
+# Begin Group "fs"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\backends\fs\fs.h
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\backends\fs\windows\windows-fs.cpp"
+# End Source File
+# End Group
+# Begin Group "midi"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\backends\midi\adlib.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\backends\midi\null.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\backends\midi\windows.cpp
+# End Source File
+# End Group
+# End Group
+# End Group
+# Begin Source File
+
+SOURCE=..\..\NEWS
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\README
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scummvm.ico
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\scummvm.rc
+# End Source File
+# End Target
+# End Project
diff --git a/scummvm.dsw b/dists/msvc6/scummvm.dsw
index c5ea314829..2335e089f5 100644
--- a/scummvm.dsw
+++ b/dists/msvc6/scummvm.dsw
@@ -1,104 +1,104 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "bs2"=.\bs2.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "queen"=.\queen.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>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name scumm

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name simon

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name sky

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name bs2

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name queen

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "simon"=.\simon.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "sky"=.\sky.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "bs2"=.\bs2.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "queen"=.\queen.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>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name scumm
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name simon
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name sky
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name bs2
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name queen
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "simon"=.\simon.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "sky"=.\sky.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/simon.dsp b/dists/msvc6/simon.dsp
index 7d01b0ce3b..8dea9b5be1 100644
--- a/simon.dsp
+++ b/dists/msvc6/simon.dsp
@@ -1,203 +1,206 @@
-# Microsoft Developer Studio Project File - Name="simon" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

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

-

-CFG=simon - 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 

-!MESSAGE NMAKE /f "simon.mak".

-!MESSAGE 

-!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 "simon.mak" CFG="simon - Win32 mad mp3 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

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

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

-!MESSAGE "simon - Win32 mad mp3 Debug" (based on "Win32 (x86) Static Library")

-!MESSAGE "simon - Win32 mad mp3 Release" (based on "Win32 (x86) Static Library")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "simon - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "simon___Release"

-# PROP Intermediate_Dir "simon___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 /GR /GX /O2 /I "." /I "common" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "USE_ADLIB" /D "BYPASS_COPY_PROT" /YX /FD /c

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo

-

-!ELSEIF  "$(CFG)" == "simon - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "simon___Win32_Debug"

-# PROP BASE Intermediate_Dir "simon___Win32_Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "simon___Debug"

-# PROP Intermediate_Dir "simon___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 /GR /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 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)" == "simon - Win32 mad mp3 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "simon___Win32_MP3_Enabled_Debug"

-# PROP BASE Intermediate_Dir "simon___Win32_MP3_Enabled_Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "simon___mad_mp3_Debug"

-# 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 /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"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo

-

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

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "simon___Win32_MP3_Enabled_Release"

-# PROP BASE Intermediate_Dir "simon___Win32_MP3_Enabled_Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "simon___mad_mp3_Release"

-# PROP Intermediate_Dir "simon___mad_mp3_Release"

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /I "." /I "common" /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" /YX /FD /c

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo

-

-!ENDIF 

-

-# Begin Target

-

-# Name "simon - Win32 Release"

-# Name "simon - Win32 Debug"

-# Name "simon - Win32 mad mp3 Debug"

-# Name "simon - Win32 mad mp3 Release"

-# Begin Group "Source Files"

-

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

-# Begin Source File

-

-SOURCE=.\simon\charset.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\simon\debug.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\simon\debug.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\simon\intern.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\simon\items.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\simon\midi.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\simon\midi.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\simon\midiparser_s1d.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\simon\res.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\simon\simon.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\simon\simon.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\simon\sound.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\simon\sound.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\simon\verb.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\simon\vga.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\simon\vga.h

-# End Source File

-# End Group

-# End Target

-# End Project

+# Microsoft Developer Studio Project File - Name="simon" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=simon - 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 
+!MESSAGE NMAKE /f "simon.mak".
+!MESSAGE 
+!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 "simon.mak" CFG="simon - Win32 mad mp3 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "simon - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "simon - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "simon - Win32 mad mp3 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "simon - Win32 mad mp3 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "simon - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "simon___Release"
+# PROP Intermediate_Dir "simon___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 /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 0x415 /d "NDEBUG"
+# ADD RSC /l 0x415 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "simon - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "simon___Win32_Debug"
+# PROP BASE Intermediate_Dir "simon___Win32_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "simon___Debug"
+# PROP Intermediate_Dir "simon___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 /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 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)" == "simon - Win32 mad mp3 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "simon___Win32_MP3_Enabled_Debug"
+# PROP BASE Intermediate_Dir "simon___Win32_MP3_Enabled_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "simon___mad_mp3_Debug"
+# 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 /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)" == "simon - Win32 mad mp3 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "simon___Win32_MP3_Enabled_Release"
+# PROP BASE Intermediate_Dir "simon___Win32_MP3_Enabled_Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "simon___mad_mp3_Release"
+# PROP Intermediate_Dir "simon___mad_mp3_Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /I "." /I "common" /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
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "simon - Win32 Release"
+# Name "simon - Win32 Debug"
+# Name "simon - Win32 mad mp3 Debug"
+# Name "simon - Win32 mad mp3 Release"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\simon\charset.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\simon\debug.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\simon\debug.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\simon\intern.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\simon\items.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\simon\midi.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\simon\midi.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\simon\midiparser_s1d.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\simon\res.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\simon\simon.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\simon\simon.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\simon\sound.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\simon\sound.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\simon\verb.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\simon\vga.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\simon\vga.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/sky.dsp b/dists/msvc6/sky.dsp
index a68370623f..e29f313010 100644
--- a/sky.dsp
+++ b/dists/msvc6/sky.dsp
@@ -1,630 +1,634 @@
-# Microsoft Developer Studio Project File - Name="sky" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

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

-

-CFG=sky - 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 

-!MESSAGE NMAKE /f "sky.mak".

-!MESSAGE 

-!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 "sky.mak" CFG="sky - Win32 mad mp3 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

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

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

-!MESSAGE "sky - Win32 mad mp3 Debug" (based on "Win32 (x86) Static Library")

-!MESSAGE "sky - Win32 mad mp3 Release" (based on "Win32 (x86) Static Library")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "sky - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "sky___Release"

-# PROP Intermediate_Dir "sky___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 /GR /GX /O2 /I "." /I "common" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo

-

-!ELSEIF  "$(CFG)" == "sky - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "sky___Debug"

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

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo

-

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

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "sky___Win32_MP3_Enabled_Debug"

-# PROP BASE Intermediate_Dir "sky___Win32_MP3_Enabled_Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "sky___mad_mp3_Debug"

-# 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 /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

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo

-

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

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "sky___Win32_MP3_Enabled_Release"

-# PROP BASE Intermediate_Dir "sky___Win32_MP3_Enabled_Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "sky___mad_mp3_Release"

-# PROP Intermediate_Dir "sky___mad_mp3_Release"

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /WX /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" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo

-

-!ENDIF 

-

-# Begin Target

-

-# Name "sky - Win32 Release"

-# Name "sky - Win32 Debug"

-# Name "sky - Win32 mad mp3 Debug"

-# Name "sky - Win32 mad mp3 Release"

-# Begin Group "Source Files"

-

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

-# Begin Group "compacts"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\sky\compacts\0compact.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\101comp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\102comp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\10comp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\11comp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\12comp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\13comp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\14comp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\15comp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\16comp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\17comp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\18comp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\19comp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\1compact.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\20comp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\21comp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\22comp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\23comp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\24comp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\25comp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\26comp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\27comp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\28comp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\29comp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\2compact.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\30comp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\31comp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\32comp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\33comp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\34comp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\36comp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\37comp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\38comp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\39comp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\3compact.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\40comp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\41comp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\42comp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\44comp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\45comp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\46comp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\47comp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\48comp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\4compact.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\5compact.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\65comp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\66comp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\67comp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\68comp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\69comp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\70comp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\71comp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\72comp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\73comp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\74comp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\75comp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\76comp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\77comp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\78comp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\79comp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\80comp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\81comp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\82comp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\85comp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\90comp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\91comp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\92comp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\93comp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\94comp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\95comp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\96comp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\9compact.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\linc_gen.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\lincmenu.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\objects.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\savedata.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compacts\z_compac.h

-# End Source File

-# End Group

-# Begin Group "music"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\sky\music\adlibchannel.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\music\adlibchannel.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\music\adlibmusic.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\music\adlibmusic.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\music\gmchannel.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\music\gmchannel.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\music\gmmusic.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\music\gmmusic.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\music\mt32music.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\music\mt32music.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\music\musicbase.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\music\musicbase.h

-# End Source File

-# End Group

-# Begin Source File

-

-SOURCE=.\sky\autoroute.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\autoroute.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compact.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\compact.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\control.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\control.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\debug.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\debug.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\disk.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\disk.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\grid.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\grid.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\hufftext.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\intro.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\intro.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\logic.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\logic.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\mouse.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\mouse.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\rnc_deco.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\rnc_deco.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\screen.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\screen.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\sky.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\sky.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\skydefs.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\sound.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\sound.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\struc.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\talks.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\text.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\sky\text.h

-# End Source File

-# End Group

-# End Target

-# End Project

+# Microsoft Developer Studio Project File - Name="sky" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=sky - 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 
+!MESSAGE NMAKE /f "sky.mak".
+!MESSAGE 
+!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 "sky.mak" CFG="sky - Win32 mad mp3 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "sky - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "sky - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "sky - Win32 mad mp3 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "sky - Win32 mad mp3 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "sky - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "sky___Release"
+# PROP Intermediate_Dir "sky___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 /GR /GX /O2 /I "." /I "common" /I "..\..\\" /I "..\..\common" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /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
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "sky - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "sky___Debug"
+# PROP Intermediate_Dir "sky___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 /GR /GX /ZI /Od /I "." /I "common" /I "..\..\\" /I "..\..\common" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /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)" == "sky - Win32 mad mp3 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "sky___Win32_MP3_Enabled_Debug"
+# PROP BASE Intermediate_Dir "sky___Win32_MP3_Enabled_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "sky___mad_mp3_Debug"
+# 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 /GX /ZI /Od /I "." /I "common" /I "..\..\\" /I "..\..\common" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /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)" == "sky - Win32 mad mp3 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "sky___Win32_MP3_Enabled_Release"
+# PROP BASE Intermediate_Dir "sky___Win32_MP3_Enabled_Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "sky___mad_mp3_Release"
+# PROP Intermediate_Dir "sky___mad_mp3_Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /WX /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" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /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
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "sky - Win32 Release"
+# Name "sky - Win32 Debug"
+# Name "sky - Win32 mad mp3 Debug"
+# Name "sky - Win32 mad mp3 Release"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Group "compacts"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\0compact.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\101comp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\102comp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\10comp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\11comp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\12comp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\13comp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\14comp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\15comp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\16comp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\17comp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\18comp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\19comp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\1compact.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\20comp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\21comp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\22comp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\23comp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\24comp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\25comp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\26comp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\27comp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\28comp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\29comp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\2compact.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\30comp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\31comp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\32comp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\33comp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\34comp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\36comp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\37comp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\38comp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\39comp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\3compact.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\40comp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\41comp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\42comp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\44comp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\45comp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\46comp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\47comp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\48comp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\4compact.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\5compact.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\65comp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\66comp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\67comp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\68comp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\69comp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\70comp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\71comp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\72comp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\73comp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\74comp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\75comp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\76comp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\77comp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\78comp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\79comp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\80comp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\81comp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\82comp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\85comp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\90comp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\91comp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\92comp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\93comp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\94comp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\95comp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\96comp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\9compact.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\linc_gen.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\lincmenu.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\objects.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\savedata.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compacts\z_compac.h
+# End Source File
+# End Group
+# Begin Group "music"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\sky\music\adlibchannel.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\music\adlibchannel.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\music\adlibmusic.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\music\adlibmusic.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\music\gmchannel.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\music\gmchannel.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\music\gmmusic.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\music\gmmusic.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\music\mt32music.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\music\mt32music.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\music\musicbase.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\music\musicbase.h
+# End Source File
+# End Group
+# Begin Source File
+
+SOURCE=..\..\sky\autoroute.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\autoroute.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compact.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\compact.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\control.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\control.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\debug.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\debug.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\disk.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\disk.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\grid.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\grid.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\hufftext.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\intro.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\intro.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\logic.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\logic.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\mouse.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\mouse.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\rnc_deco.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\rnc_deco.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\screen.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\screen.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\sky.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\sky.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\skydefs.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\sound.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\sound.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\struc.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\talks.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\text.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\sky\text.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/bs2.vcproj b/dists/msvc7/bs2.vcproj
index 7fd0ba2360..f6322266e2 100644
--- a/bs2.vcproj
+++ b/dists/msvc7/bs2.vcproj
@@ -12,14 +12,14 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="vc7_out/bs2_Debug"
-			IntermediateDirectory="vc7_out/bs2_Debug"
+			OutputDirectory="bs2_Debug"
+			IntermediateDirectory="bs2_Debug"
 			ConfigurationType="4"
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="."
+				AdditionalIncludeDirectories="../../;../../common"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;USE_ADLIB"
 				MinimalRebuild="TRUE"
 				ExceptionHandling="FALSE"
@@ -53,17 +53,17 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="vc7_out/bs2_Release"
-			IntermediateDirectory="vc7_out/bs2_Release"
+			OutputDirectory="bs2_Release"
+			IntermediateDirectory="bs2_Release"
 			ConfigurationType="4"
 			CharacterSet="2"
-			WholeProgramOptimization="TRUE">
+			WholeProgramOptimization="FALSE">
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="."
+				AdditionalIncludeDirectories="../../;../../common"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;USE_ADLIB"
 				StringPooling="TRUE"
 				ExceptionHandling="FALSE"
@@ -99,242 +99,242 @@
 			Name="driver"
 			Filter="">
 			<File
-				RelativePath="bs2\driver\_console.cpp">
+				RelativePath="..\..\bs2\driver\_console.cpp">
 			</File>
 			<File
-				RelativePath="bs2\driver\_console.h">
+				RelativePath="..\..\bs2\driver\_console.h">
 			</File>
 			<File
-				RelativePath="bs2\driver\_mouse.cpp">
+				RelativePath="..\..\bs2\driver\_mouse.cpp">
 			</File>
 			<File
-				RelativePath="bs2\driver\_mouse.h">
+				RelativePath="..\..\bs2\driver\_mouse.h">
 			</File>
 			<File
-				RelativePath="bs2\driver\d_draw.cpp">
+				RelativePath="..\..\bs2\driver\d_draw.cpp">
 			</File>
 			<File
-				RelativePath="bs2\driver\d_draw.h">
+				RelativePath="..\..\bs2\driver\d_draw.h">
 			</File>
 			<File
-				RelativePath="bs2\driver\d_sound.cpp">
+				RelativePath="..\..\bs2\driver\d_sound.cpp">
 			</File>
 			<File
-				RelativePath="bs2\driver\d_sound.h">
+				RelativePath="..\..\bs2\driver\d_sound.h">
 			</File>
 			<File
-				RelativePath="bs2\driver\driver96.h">
+				RelativePath="..\..\bs2\driver\driver96.h">
 			</File>
 			<File
-				RelativePath="bs2\driver\keyboard.cpp">
+				RelativePath="..\..\bs2\driver\keyboard.cpp">
 			</File>
 			<File
-				RelativePath="bs2\driver\keyboard.h">
+				RelativePath="..\..\bs2\driver\keyboard.h">
 			</File>
 			<File
-				RelativePath="bs2\driver\language.cpp">
+				RelativePath="..\..\bs2\driver\language.cpp">
 			</File>
 			<File
-				RelativePath="bs2\driver\menu.cpp">
+				RelativePath="..\..\bs2\driver\menu.cpp">
 			</File>
 			<File
-				RelativePath="bs2\driver\menu.h">
+				RelativePath="..\..\bs2\driver\menu.h">
 			</File>
 			<File
-				RelativePath="bs2\driver\misc.cpp">
+				RelativePath="..\..\bs2\driver\misc.cpp">
 			</File>
 			<File
-				RelativePath="bs2\driver\palette.cpp">
+				RelativePath="..\..\bs2\driver\palette.cpp">
 			</File>
 			<File
-				RelativePath="bs2\driver\palette.h">
+				RelativePath="..\..\bs2\driver\palette.h">
 			</File>
 			<File
-				RelativePath="bs2\driver\rdwin.cpp">
+				RelativePath="..\..\bs2\driver\rdwin.cpp">
 			</File>
 			<File
-				RelativePath="bs2\driver\rdwin.h">
+				RelativePath="..\..\bs2\driver\rdwin.h">
 			</File>
 			<File
-				RelativePath="bs2\driver\render.cpp">
+				RelativePath="..\..\bs2\driver\render.cpp">
 			</File>
 			<File
-				RelativePath="bs2\driver\render.h">
+				RelativePath="..\..\bs2\driver\render.h">
 			</File>
 			<File
-				RelativePath="bs2\driver\sprite.cpp">
+				RelativePath="..\..\bs2\driver\sprite.cpp">
 			</File>
 		</Filter>
 		<File
-			RelativePath="bs2\anims.cpp">
+			RelativePath="..\..\bs2\anims.cpp">
 		</File>
 		<File
-			RelativePath="bs2\anims.h">
+			RelativePath="..\..\bs2\anims.h">
 		</File>
 		<File
-			RelativePath="bs2\build_display.cpp">
+			RelativePath="..\..\bs2\build_display.cpp">
 		</File>
 		<File
-			RelativePath="bs2\build_display.h">
+			RelativePath="..\..\bs2\build_display.h">
 		</File>
 		<File
-			RelativePath="bs2\console.cpp">
+			RelativePath="..\..\bs2\console.cpp">
 		</File>
 		<File
-			RelativePath="bs2\console.h">
+			RelativePath="..\..\bs2\console.h">
 		</File>
 		<File
-			RelativePath="bs2\controls.cpp">
+			RelativePath="..\..\bs2\controls.cpp">
 		</File>
 		<File
-			RelativePath="bs2\controls.h">
+			RelativePath="..\..\bs2\controls.h">
 		</File>
 		<File
-			RelativePath="bs2\credits.h">
+			RelativePath="..\..\bs2\credits.h">
 		</File>
 		<File
-			RelativePath="bs2\debug.cpp">
+			RelativePath="..\..\bs2\debug.cpp">
 		</File>
 		<File
-			RelativePath="bs2\debug.h">
+			RelativePath="..\..\bs2\debug.h">
 		</File>
 		<File
-			RelativePath="bs2\defs.h">
+			RelativePath="..\..\bs2\defs.h">
 		</File>
 		<File
-			RelativePath="bs2\events.cpp">
+			RelativePath="..\..\bs2\events.cpp">
 		</File>
 		<File
-			RelativePath="bs2\events.h">
+			RelativePath="..\..\bs2\events.h">
 		</File>
 		<File
-			RelativePath="bs2\function.cpp">
+			RelativePath="..\..\bs2\function.cpp">
 		</File>
 		<File
-			RelativePath="bs2\function.h">
+			RelativePath="..\..\bs2\function.h">
 		</File>
 		<File
-			RelativePath="bs2\header.h">
+			RelativePath="..\..\bs2\header.h">
 		</File>
 		<File
-			RelativePath="bs2\icons.cpp">
+			RelativePath="..\..\bs2\icons.cpp">
 		</File>
 		<File
-			RelativePath="bs2\icons.h">
+			RelativePath="..\..\bs2\icons.h">
 		</File>
 		<File
-			RelativePath="bs2\interpreter.cpp">
+			RelativePath="..\..\bs2\interpreter.cpp">
 		</File>
 		<File
-			RelativePath="bs2\interpreter.h">
+			RelativePath="..\..\bs2\interpreter.h">
 		</File>
 		<File
-			RelativePath="bs2\layers.cpp">
+			RelativePath="..\..\bs2\layers.cpp">
 		</File>
 		<File
-			RelativePath="bs2\layers.h">
+			RelativePath="..\..\bs2\layers.h">
 		</File>
 		<File
-			RelativePath="bs2\logic.cpp">
+			RelativePath="..\..\bs2\logic.cpp">
 		</File>
 		<File
-			RelativePath="bs2\logic.h">
+			RelativePath="..\..\bs2\logic.h">
 		</File>
 		<File
-			RelativePath="bs2\maketext.cpp">
+			RelativePath="..\..\bs2\maketext.cpp">
 		</File>
 		<File
-			RelativePath="bs2\maketext.h">
+			RelativePath="..\..\bs2\maketext.h">
 		</File>
 		<File
-			RelativePath="bs2\mem_view.cpp">
+			RelativePath="..\..\bs2\mem_view.cpp">
 		</File>
 		<File
-			RelativePath="bs2\memory.cpp">
+			RelativePath="..\..\bs2\memory.cpp">
 		</File>
 		<File
-			RelativePath="bs2\memory.h">
+			RelativePath="..\..\bs2\memory.h">
 		</File>
 		<File
-			RelativePath="bs2\mouse.cpp">
+			RelativePath="..\..\bs2\mouse.cpp">
 		</File>
 		<File
-			RelativePath="bs2\mouse.h">
+			RelativePath="..\..\bs2\mouse.h">
 		</File>
 		<File
-			RelativePath="bs2\object.h">
+			RelativePath="..\..\bs2\object.h">
 		</File>
 		<File
-			RelativePath="bs2\protocol.cpp">
+			RelativePath="..\..\bs2\protocol.cpp">
 		</File>
 		<File
-			RelativePath="bs2\protocol.h">
+			RelativePath="..\..\bs2\protocol.h">
 		</File>
 		<File
-			RelativePath="bs2\resman.cpp">
+			RelativePath="..\..\bs2\resman.cpp">
 		</File>
 		<File
-			RelativePath="bs2\resman.h">
+			RelativePath="..\..\bs2\resman.h">
 		</File>
 		<File
-			RelativePath="bs2\router.cpp">
+			RelativePath="..\..\bs2\router.cpp">
 		</File>
 		<File
-			RelativePath="bs2\router.h">
+			RelativePath="..\..\bs2\router.h">
 		</File>
 		<File
-			RelativePath="bs2\save_rest.cpp">
+			RelativePath="..\..\bs2\save_rest.cpp">
 		</File>
 		<File
-			RelativePath="bs2\save_rest.h">
+			RelativePath="..\..\bs2\save_rest.h">
 		</File>
 		<File
-			RelativePath="bs2\scroll.cpp">
+			RelativePath="..\..\bs2\scroll.cpp">
 		</File>
 		<File
-			RelativePath="bs2\scroll.h">
+			RelativePath="..\..\bs2\scroll.h">
 		</File>
 		<File
-			RelativePath="bs2\sound.cpp">
+			RelativePath="..\..\bs2\sound.cpp">
 		</File>
 		<File
-			RelativePath="bs2\sound.h">
+			RelativePath="..\..\bs2\sound.h">
 		</File>
 		<File
-			RelativePath="bs2\speech.cpp">
+			RelativePath="..\..\bs2\speech.cpp">
 		</File>
 		<File
-			RelativePath="bs2\speech.h">
+			RelativePath="..\..\bs2\speech.h">
 		</File>
 		<File
-			RelativePath="bs2\startup.cpp">
+			RelativePath="..\..\bs2\startup.cpp">
 		</File>
 		<File
-			RelativePath="bs2\startup.h">
+			RelativePath="..\..\bs2\startup.h">
 		</File>
 		<File
-			RelativePath="bs2\sword2.cpp">
+			RelativePath="..\..\bs2\sword2.cpp">
 		</File>
 		<File
-			RelativePath="bs2\sword2.h">
+			RelativePath="..\..\bs2\sword2.h">
 		</File>
 		<File
-			RelativePath="bs2\sync.cpp">
+			RelativePath="..\..\bs2\sync.cpp">
 		</File>
 		<File
-			RelativePath="bs2\sync.h">
+			RelativePath="..\..\bs2\sync.h">
 		</File>
 		<File
-			RelativePath="bs2\tony_gsdk.cpp">
+			RelativePath="..\..\bs2\tony_gsdk.cpp">
 		</File>
 		<File
-			RelativePath="bs2\tony_gsdk.h">
+			RelativePath="..\..\bs2\tony_gsdk.h">
 		</File>
 		<File
-			RelativePath="bs2\walker.cpp">
+			RelativePath="..\..\bs2\walker.cpp">
 		</File>
 		<File
-			RelativePath="bs2\walker.h">
+			RelativePath="..\..\bs2\walker.h">
 		</File>
 	</Files>
 	<Globals>
diff --git a/queen.vcproj b/dists/msvc7/queen.vcproj
index 51fcb126e2..f9417b524b 100644
--- a/queen.vcproj
+++ b/dists/msvc7/queen.vcproj
@@ -12,14 +12,14 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="vc7_out/queen_Debug"
-			IntermediateDirectory="vc7_out/queen_Debug"
+			OutputDirectory="queen_Debug"
+			IntermediateDirectory="queen_Debug"
 			ConfigurationType="4"
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="."
+				AdditionalIncludeDirectories="../../;../../common"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;USE_ADLIB"
 				MinimalRebuild="TRUE"
 				ExceptionHandling="FALSE"
@@ -53,17 +53,17 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="vc7_out/queen_Release"
-			IntermediateDirectory="vc7_out/queen_Release"
+			OutputDirectory="queen_Release"
+			IntermediateDirectory="queen_Release"
 			ConfigurationType="4"
 			CharacterSet="2"
-			WholeProgramOptimization="TRUE">
+			WholeProgramOptimization="FALSE">
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="."
+				AdditionalIncludeDirectories="../../;../../common"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;USE_ADLIB"
 				StringPooling="TRUE"
 				ExceptionHandling="FALSE"
@@ -96,40 +96,40 @@
 	</Configurations>
 	<Files>
 		<File
-			RelativePath="queen\cutaway.cpp">
+			RelativePath="..\..\queen\cutaway.cpp">
 		</File>
 		<File
-			RelativePath="queen\cutaway.h">
+			RelativePath="..\..\queen\cutaway.h">
 		</File>
 		<File
-			RelativePath="queen\graphics.cpp">
+			RelativePath="..\..\queen\graphics.cpp">
 		</File>
 		<File
-			RelativePath="queen\graphics.h">
+			RelativePath="..\..\queen\graphics.h">
 		</File>
 		<File
-			RelativePath="queen\logic.cpp">
+			RelativePath="..\..\queen\logic.cpp">
 		</File>
 		<File
-			RelativePath="queen\logic.h">
+			RelativePath="..\..\queen\logic.h">
 		</File>
 		<File
-			RelativePath="queen\queen.cpp">
+			RelativePath="..\..\queen\queen.cpp">
 		</File>
 		<File
-			RelativePath="queen\queen.h">
+			RelativePath="..\..\queen\queen.h">
 		</File>
 		<File
-			RelativePath="queen\resource.cpp">
+			RelativePath="..\..\queen\resource.cpp">
 		</File>
 		<File
-			RelativePath="queen\resource.h">
+			RelativePath="..\..\queen\resource.h">
 		</File>
 		<File
-			RelativePath="queen\restables.cpp">
+			RelativePath="..\..\queen\restables.cpp">
 		</File>
 		<File
-			RelativePath="queen\version.cpp">
+			RelativePath="..\..\queen\version.cpp">
 		</File>
 	</Files>
 	<Globals>
diff --git a/dists/msvc7/scumm.vcproj b/dists/msvc7/scumm.vcproj
new file mode 100644
index 0000000000..6d4d386932
--- /dev/null
+++ b/dists/msvc7/scumm.vcproj
@@ -0,0 +1,380 @@
+<?xml version="1.0" encoding = "windows-1250"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.00"
+	Name="scumm"
+	ProjectGUID="{B6AFD548-63D2-40CD-A652-E87095AFCBAF}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="scumm_Debug"
+			IntermediateDirectory="scumm_Debug"
+			ConfigurationType="4"
+			CharacterSet="2"
+			WholeProgramOptimization="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../../;../../common"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;USE_ADLIB;BYPASS_COPY_PROT"
+				MinimalRebuild="TRUE"
+				ExceptionHandling="FALSE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="TRUE"
+				EnableFunctionLevelLinking="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				WarnAsError="TRUE"
+				SuppressStartupBanner="FALSE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)/scumm.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="scumm_Release"
+			IntermediateDirectory="scumm_Release"
+			ConfigurationType="4"
+			CharacterSet="2"
+			WholeProgramOptimization="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				OmitFramePointers="TRUE"
+				AdditionalIncludeDirectories="../../;../../common"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;USE_ADLIB;BYPASS_COPY_PROT"
+				StringPooling="TRUE"
+				ExceptionHandling="FALSE"
+				RuntimeLibrary="0"
+				BufferSecurityCheck="FALSE"
+				EnableFunctionLevelLinking="FALSE"
+				DisableLanguageExtensions="FALSE"
+				ForceConformanceInForLoopScope="TRUE"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				WarnAsError="TRUE"
+				DebugInformationFormat="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)/scumm.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<Files>
+		<Filter
+			Name="smush"
+			Filter="">
+			<File
+				RelativePath="..\..\scumm\smush\channel.h">
+			</File>
+			<File
+				RelativePath="..\..\scumm\smush\chunk.cpp">
+			</File>
+			<File
+				RelativePath="..\..\scumm\smush\chunk.h">
+			</File>
+			<File
+				RelativePath="..\..\scumm\smush\chunk_type.h">
+			</File>
+			<File
+				RelativePath="..\..\scumm\smush\codec1.cpp">
+			</File>
+			<File
+				RelativePath="..\..\scumm\smush\codec37.cpp">
+			</File>
+			<File
+				RelativePath="..\..\scumm\smush\codec37.h">
+			</File>
+			<File
+				RelativePath="..\..\scumm\smush\codec47.cpp">
+			</File>
+			<File
+				RelativePath="..\..\scumm\smush\codec47.h">
+			</File>
+			<File
+				RelativePath="..\..\scumm\smush\imuse_channel.cpp">
+			</File>
+			<File
+				RelativePath="..\..\scumm\smush\saud_channel.cpp">
+			</File>
+			<File
+				RelativePath="..\..\scumm\smush\smush_font.cpp">
+			</File>
+			<File
+				RelativePath="..\..\scumm\smush\smush_font.h">
+			</File>
+			<File
+				RelativePath="..\..\scumm\smush\smush_mixer.cpp">
+			</File>
+			<File
+				RelativePath="..\..\scumm\smush\smush_mixer.h">
+			</File>
+			<File
+				RelativePath="..\..\scumm\smush\smush_player.cpp">
+			</File>
+			<File
+				RelativePath="..\..\scumm\smush\smush_player.h">
+			</File>
+		</Filter>
+		<File
+			RelativePath="..\..\scumm\actor.cpp">
+		</File>
+		<File
+			RelativePath="..\..\scumm\actor.h">
+		</File>
+		<File
+			RelativePath="..\..\scumm\akos.cpp">
+		</File>
+		<File
+			RelativePath="..\..\scumm\akos.h">
+		</File>
+		<File
+			RelativePath="..\..\scumm\base-costume.cpp">
+		</File>
+		<File
+			RelativePath="..\..\scumm\base-costume.h">
+		</File>
+		<File
+			RelativePath="..\..\scumm\bomp.cpp">
+		</File>
+		<File
+			RelativePath="..\..\scumm\bomp.h">
+		</File>
+		<File
+			RelativePath="..\..\scumm\boxes.cpp">
+		</File>
+		<File
+			RelativePath="..\..\scumm\boxes.h">
+		</File>
+		<File
+			RelativePath="..\..\scumm\bundle.cpp">
+		</File>
+		<File
+			RelativePath="..\..\scumm\bundle.h">
+		</File>
+		<File
+			RelativePath="..\..\scumm\camera.cpp">
+		</File>
+		<File
+			RelativePath="..\..\scumm\charset.cpp">
+		</File>
+		<File
+			RelativePath="..\..\scumm\charset.h">
+		</File>
+		<File
+			RelativePath="..\..\scumm\costume.cpp">
+		</File>
+		<File
+			RelativePath="..\..\scumm\costume.h">
+		</File>
+		<File
+			RelativePath="..\..\scumm\debugger.cpp">
+		</File>
+		<File
+			RelativePath="..\..\scumm\debugger.h">
+		</File>
+		<File
+			RelativePath="..\..\scumm\dialogs.cpp">
+		</File>
+		<File
+			RelativePath="..\..\scumm\dialogs.h">
+		</File>
+		<File
+			RelativePath="..\..\scumm\gfx.cpp">
+		</File>
+		<File
+			RelativePath="..\..\scumm\gfx.h">
+		</File>
+		<File
+			RelativePath="..\..\scumm\help.cpp">
+		</File>
+		<File
+			RelativePath="..\..\scumm\help.h">
+		</File>
+		<File
+			RelativePath="..\..\scumm\imuse.cpp">
+		</File>
+		<File
+			RelativePath="..\..\scumm\imuse.h">
+		</File>
+		<File
+			RelativePath="..\..\scumm\imuse_digi.cpp">
+		</File>
+		<File
+			RelativePath="..\..\scumm\imuse_digi.h">
+		</File>
+		<File
+			RelativePath="..\..\scumm\imuse_internal.h">
+		</File>
+		<File
+			RelativePath="..\..\scumm\imuse_player.cpp">
+		</File>
+		<File
+			RelativePath="..\..\scumm\instrument.cpp">
+		</File>
+		<File
+			RelativePath="..\..\scumm\instrument.h">
+		</File>
+		<File
+			RelativePath="..\..\scumm\intern.h">
+		</File>
+		<File
+			RelativePath="..\..\scumm\midiparser_eup.cpp">
+		</File>
+		<File
+			RelativePath="..\..\scumm\midiparser_ro.cpp">
+		</File>
+		<File
+			RelativePath="..\..\scumm\music.h">
+		</File>
+		<File
+			RelativePath="..\..\scumm\nut_renderer.cpp">
+		</File>
+		<File
+			RelativePath="..\..\scumm\nut_renderer.h">
+		</File>
+		<File
+			RelativePath="..\..\scumm\object.cpp">
+		</File>
+		<File
+			RelativePath="..\..\scumm\object.h">
+		</File>
+		<File
+			RelativePath="..\..\scumm\player_mod.cpp">
+		</File>
+		<File
+			RelativePath="..\..\scumm\player_mod.h">
+		</File>
+		<File
+			RelativePath="..\..\scumm\player_v1.cpp">
+		</File>
+		<File
+			RelativePath="..\..\scumm\player_v1.h">
+		</File>
+		<File
+			RelativePath="..\..\scumm\player_v2.cpp">
+		</File>
+		<File
+			RelativePath="..\..\scumm\player_v2.h">
+		</File>
+		<File
+			RelativePath="..\..\scumm\player_v2a.cpp">
+		</File>
+		<File
+			RelativePath="..\..\scumm\player_v2a.h">
+		</File>
+		<File
+			RelativePath="..\..\scumm\player_v3a.cpp">
+		</File>
+		<File
+			RelativePath="..\..\scumm\player_v3a.h">
+		</File>
+		<File
+			RelativePath="..\..\scumm\resource.cpp">
+		</File>
+		<File
+			RelativePath="..\..\scumm\resource.h">
+		</File>
+		<File
+			RelativePath="..\..\scumm\resource_v2.cpp">
+		</File>
+		<File
+			RelativePath="..\..\scumm\resource_v3.cpp">
+		</File>
+		<File
+			RelativePath="..\..\scumm\resource_v4.cpp">
+		</File>
+		<File
+			RelativePath="..\..\scumm\saveload.cpp">
+		</File>
+		<File
+			RelativePath="..\..\scumm\saveload.h">
+		</File>
+		<File
+			RelativePath="..\..\scumm\script.cpp">
+		</File>
+		<File
+			RelativePath="..\..\scumm\script.h">
+		</File>
+		<File
+			RelativePath="..\..\scumm\script_v2.cpp">
+		</File>
+		<File
+			RelativePath="..\..\scumm\script_v5.cpp">
+		</File>
+		<File
+			RelativePath="..\..\scumm\script_v6.cpp">
+		</File>
+		<File
+			RelativePath="..\..\scumm\script_v8.cpp">
+		</File>
+		<File
+			RelativePath="..\..\scumm\scumm.h">
+		</File>
+		<File
+			RelativePath="..\..\scumm\scummvm.cpp">
+		</File>
+		<File
+			RelativePath="..\..\scumm\sound.cpp">
+		</File>
+		<File
+			RelativePath="..\..\scumm\sound.h">
+		</File>
+		<File
+			RelativePath="..\..\scumm\string.cpp">
+		</File>
+		<File
+			RelativePath="..\..\scumm\usage_bits.cpp">
+		</File>
+		<File
+			RelativePath="..\..\scumm\usage_bits.h">
+		</File>
+		<File
+			RelativePath="..\..\scumm\vars.cpp">
+		</File>
+		<File
+			RelativePath="..\..\scumm\verbs.cpp">
+		</File>
+		<File
+			RelativePath="..\..\scumm\verbs.h">
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/scummvm.sln b/dists/msvc7/scummvm.sln
index 9c70984786..9c70984786 100644
--- a/scummvm.sln
+++ b/dists/msvc7/scummvm.sln
diff --git a/scummvm.vcproj b/dists/msvc7/scummvm.vcproj
index 24a97f9202..cb9366490a 100644
--- a/scummvm.vcproj
+++ b/dists/msvc7/scummvm.vcproj
@@ -12,14 +12,14 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="vc7_out/scummvm_Debug"
-			IntermediateDirectory="vc7_out/scummvm_Debug"
+			OutputDirectory="scummvm_Debug"
+			IntermediateDirectory="scummvm_Debug"
 			ConfigurationType="1"
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="."
+				AdditionalIncludeDirectories="../../;../../common"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;USE_ADLIB"
 				MinimalRebuild="TRUE"
 				ExceptionHandling="FALSE"
@@ -38,7 +38,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib sdl.lib vc7_out/bs2_debug/bs2.lib vc7_out/queen_debug/queen.lib vc7_out/scumm_debug/scumm.lib vc7_out/simon_debug/simon.lib vc7_out/sky_debug/sky.lib"
+				AdditionalDependencies="winmm.lib sdl.lib bs2_debug/bs2.lib queen_debug/queen.lib scumm_debug/scumm.lib simon_debug/simon.lib sky_debug/sky.lib"
 				OutputFile="$(OutDir)/scummvm.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="TRUE"
@@ -62,17 +62,17 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="vc7_out/scummvm_Release"
-			IntermediateDirectory="vc7_out/scummvm_Release"
+			OutputDirectory="scummvm_Release"
+			IntermediateDirectory="scummvm_Release"
 			ConfigurationType="1"
 			CharacterSet="2"
-			WholeProgramOptimization="TRUE">
+			WholeProgramOptimization="FALSE">
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="."
+				AdditionalIncludeDirectories="../../;../../common"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;USE_ADLIB"
 				StringPooling="TRUE"
 				MinimalRebuild="FALSE"
@@ -90,7 +90,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib sdl.lib vc7_out/bs2_release/bs2.lib vc7_out/queen_release/queen.lib vc7_out/scumm_release/scumm.lib vc7_out/simon_release/simon.lib vc7_out/sky_release/sky.lib"
+				AdditionalDependencies="winmm.lib sdl.lib bs2_release/bs2.lib queen_release/queen.lib scumm_release/scumm.lib simon_release/simon.lib sky_release/sky.lib"
 				OutputFile="$(OutDir)/scummvm.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -120,107 +120,107 @@
 			Name="base"
 			Filter="">
 			<File
-				RelativePath="base\engine.cpp">
+				RelativePath="..\..\base\engine.cpp">
 			</File>
 			<File
-				RelativePath="base\engine.h">
+				RelativePath="..\..\base\engine.h">
 			</File>
 			<File
-				RelativePath="base\gameDetector.cpp">
+				RelativePath="..\..\base\gameDetector.cpp">
 			</File>
 			<File
-				RelativePath="base\gameDetector.h">
+				RelativePath="..\..\base\gameDetector.h">
 			</File>
 			<File
-				RelativePath="base\main.cpp">
+				RelativePath="..\..\base\main.cpp">
 			</File>
 			<File
-				RelativePath="base\plugins.cpp">
+				RelativePath="..\..\base\plugins.cpp">
 			</File>
 			<File
-				RelativePath="base\plugins.h">
+				RelativePath="..\..\base\plugins.h">
 			</File>
 		</Filter>
 		<Filter
 			Name="common"
 			Filter="">
 			<File
-				RelativePath="common\config-file.cpp">
+				RelativePath="..\..\common\config-file.cpp">
 			</File>
 			<File
-				RelativePath="common\config-file.h">
+				RelativePath="..\..\common\config-file.h">
 			</File>
 			<File
-				RelativePath="common\file.cpp">
+				RelativePath="..\..\common\file.cpp">
 			</File>
 			<File
-				RelativePath="common\file.h">
+				RelativePath="..\..\common\file.h">
 			</File>
 			<File
-				RelativePath="common\list.h">
+				RelativePath="..\..\common\list.h">
 			</File>
 			<File
-				RelativePath="common\map.h">
+				RelativePath="..\..\common\map.h">
 			</File>
 			<File
-				RelativePath="common\rect.h">
+				RelativePath="..\..\common\rect.h">
 			</File>
 			<File
-				RelativePath="common\savefile.cpp">
+				RelativePath="..\..\common\savefile.cpp">
 			</File>
 			<File
-				RelativePath="common\savefile.h">
+				RelativePath="..\..\common\savefile.h">
 			</File>
 			<File
-				RelativePath="common\scaler.cpp">
+				RelativePath="..\..\common\scaler.cpp">
 			</File>
 			<File
-				RelativePath="common\scaler.h">
+				RelativePath="..\..\common\scaler.h">
 			</File>
 			<File
-				RelativePath="common\scummsys.h">
+				RelativePath="..\..\common\scummsys.h">
 			</File>
 			<File
-				RelativePath="common\stdafx.h">
+				RelativePath="..\..\common\stdafx.h">
 			</File>
 			<File
-				RelativePath="common\str.cpp">
+				RelativePath="..\..\common\str.cpp">
 			</File>
 			<File
-				RelativePath="common\str.h">
+				RelativePath="..\..\common\str.h">
 			</File>
 			<File
-				RelativePath="common\system.h">
+				RelativePath="..\..\common\system.h">
 			</File>
 			<File
-				RelativePath="common\timer.cpp">
+				RelativePath="..\..\common\timer.cpp">
 			</File>
 			<File
-				RelativePath="common\timer.h">
+				RelativePath="..\..\common\timer.h">
 			</File>
 			<File
-				RelativePath="common\util.cpp">
+				RelativePath="..\..\common\util.cpp">
 			</File>
 			<File
-				RelativePath="common\util.h">
+				RelativePath="..\..\common\util.h">
 			</File>
 			<Filter
 				Name="scaler"
 				Filter="">
 				<File
-					RelativePath="common\scaler\2xsai.cpp">
+					RelativePath="..\..\common\scaler\2xsai.cpp">
 				</File>
 				<File
-					RelativePath="common\scaler\aspect.cpp">
+					RelativePath="..\..\common\scaler\aspect.cpp">
 				</File>
 				<File
-					RelativePath="common\scaler\hq2x.cpp">
+					RelativePath="..\..\common\scaler\hq2x.cpp">
 				</File>
 				<File
-					RelativePath="common\scaler\hq3x.cpp">
+					RelativePath="..\..\common\scaler\hq3x.cpp">
 				</File>
 				<File
-					RelativePath="common\scaler\intern.h">
+					RelativePath="..\..\common\scaler\intern.h">
 				</File>
 			</Filter>
 		</Filter>
@@ -228,129 +228,132 @@
 			Name="sound"
 			Filter="">
 			<File
-				RelativePath="sound\audiostream.cpp">
+				RelativePath="..\..\sound\audiostream.cpp">
 			</File>
 			<File
-				RelativePath="sound\audiostream.h">
+				RelativePath="..\..\sound\audiostream.h">
 			</File>
 			<File
-				RelativePath="sound\fmopl.cpp">
+				RelativePath="..\..\sound\fmopl.cpp">
 			</File>
 			<File
-				RelativePath="sound\fmopl.h">
+				RelativePath="..\..\sound\fmopl.h">
 			</File>
 			<File
-				RelativePath="sound\mididrv.h">
+				RelativePath="..\..\sound\mididrv.cpp">
 			</File>
 			<File
-				RelativePath="sound\midiparser.cpp">
+				RelativePath="..\..\sound\mididrv.h">
 			</File>
 			<File
-				RelativePath="sound\midiparser.h">
+				RelativePath="..\..\sound\midiparser.cpp">
 			</File>
 			<File
-				RelativePath="sound\midiparser_smf.cpp">
+				RelativePath="..\..\sound\midiparser.h">
 			</File>
 			<File
-				RelativePath="sound\midiparser_xmidi.cpp">
+				RelativePath="..\..\sound\midiparser_smf.cpp">
 			</File>
 			<File
-				RelativePath="sound\mixer.cpp">
+				RelativePath="..\..\sound\midiparser_xmidi.cpp">
 			</File>
 			<File
-				RelativePath="sound\mixer.h">
+				RelativePath="..\..\sound\mixer.cpp">
 			</File>
 			<File
-				RelativePath="sound\mpu401.cpp">
+				RelativePath="..\..\sound\mixer.h">
 			</File>
 			<File
-				RelativePath="sound\mpu401.h">
+				RelativePath="..\..\sound\mpu401.cpp">
 			</File>
 			<File
-				RelativePath="sound\rate.cpp">
+				RelativePath="..\..\sound\mpu401.h">
 			</File>
 			<File
-				RelativePath="sound\rate.h">
+				RelativePath="..\..\sound\rate.cpp">
 			</File>
 			<File
-				RelativePath="sound\resample.cpp">
+				RelativePath="..\..\sound\rate.h">
 			</File>
 			<File
-				RelativePath="sound\resample.h">
+				RelativePath="..\..\sound\resample.cpp">
 			</File>
 			<File
-				RelativePath="sound\voc.cpp">
+				RelativePath="..\..\sound\resample.h">
 			</File>
 			<File
-				RelativePath="sound\voc.h">
+				RelativePath="..\..\sound\voc.cpp">
+			</File>
+			<File
+				RelativePath="..\..\sound\voc.h">
 			</File>
 		</Filter>
 		<Filter
 			Name="txt"
 			Filter="">
 			<File
-				RelativePath="COPYING">
+				RelativePath="..\..\COPYING">
 			</File>
 			<File
-				RelativePath="NEWS">
+				RelativePath="..\..\NEWS">
 			</File>
 			<File
-				RelativePath="README">
+				RelativePath="..\..\README">
 			</File>
 			<File
-				RelativePath="TODO">
+				RelativePath="..\..\TODO">
 			</File>
 		</Filter>
 		<Filter
 			Name="rsc"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
 			<File
-				RelativePath="scummvm.ico">
+				RelativePath="..\..\scummvm.ico">
 			</File>
 			<File
-				RelativePath="scummvm.rc">
+				RelativePath="..\..\scummvm.rc">
 			</File>
 		</Filter>
 		<Filter
 			Name="backends"
 			Filter="">
 			<File
-				RelativePath="backends\intern.h">
+				RelativePath="..\..\backends\intern.h">
 			</File>
 			<Filter
 				Name="sdl"
 				Filter="">
 				<File
-					RelativePath="backends\sdl\sdl-common.cpp">
+					RelativePath="..\..\backends\sdl\sdl-common.cpp">
 				</File>
 				<File
-					RelativePath="backends\sdl\sdl-common.h">
+					RelativePath="..\..\backends\sdl\sdl-common.h">
 				</File>
 				<File
-					RelativePath="backends\sdl\sdl.cpp">
+					RelativePath="..\..\backends\sdl\sdl.cpp">
 				</File>
 			</Filter>
 			<Filter
 				Name="fs"
 				Filter="">
 				<File
-					RelativePath="backends\fs\fs.h">
+					RelativePath="..\..\backends\fs\fs.h">
 				</File>
 				<File
-					RelativePath="backends\fs\windows\windows-fs.cpp">
+					RelativePath="..\..\backends\fs\windows\windows-fs.cpp">
 				</File>
 			</Filter>
 			<Filter
 				Name="midi"
 				Filter="">
 				<File
-					RelativePath="backends\midi\adlib.cpp">
+					RelativePath="..\..\backends\midi\adlib.cpp">
 				</File>
 				<File
-					RelativePath="backends\midi\null.cpp">
+					RelativePath="..\..\backends\midi\null.cpp">
 				</File>
 				<File
-					RelativePath="backends\midi\windows.cpp">
+					RelativePath="..\..\backends\midi\windows.cpp">
 				</File>
 			</Filter>
 		</Filter>
@@ -358,88 +361,88 @@
 			Name="gui"
 			Filter="">
 			<File
-				RelativePath="gui\EditTextWidget.cpp">
+				RelativePath="..\..\gui\EditTextWidget.cpp">
 			</File>
 			<File
-				RelativePath="gui\EditTextWidget.h">
+				RelativePath="..\..\gui\EditTextWidget.h">
 			</File>
 			<File
-				RelativePath="gui\ListWidget.cpp">
+				RelativePath="..\..\gui\ListWidget.cpp">
 			</File>
 			<File
-				RelativePath="gui\ListWidget.h">
+				RelativePath="..\..\gui\ListWidget.h">
 			</File>
 			<File
-				RelativePath="gui\PopUpWidget.cpp">
+				RelativePath="..\..\gui\PopUpWidget.cpp">
 			</File>
 			<File
-				RelativePath="gui\PopUpWidget.h">
+				RelativePath="..\..\gui\PopUpWidget.h">
 			</File>
 			<File
-				RelativePath="gui\ScrollBarWidget.cpp">
+				RelativePath="..\..\gui\ScrollBarWidget.cpp">
 			</File>
 			<File
-				RelativePath="gui\ScrollBarWidget.h">
+				RelativePath="..\..\gui\ScrollBarWidget.h">
 			</File>
 			<File
-				RelativePath="gui\about.cpp">
+				RelativePath="..\..\gui\about.cpp">
 			</File>
 			<File
-				RelativePath="gui\about.h">
+				RelativePath="..\..\gui\about.h">
 			</File>
 			<File
-				RelativePath="gui\browser.cpp">
+				RelativePath="..\..\gui\browser.cpp">
 			</File>
 			<File
-				RelativePath="gui\browser.h">
+				RelativePath="..\..\gui\browser.h">
 			</File>
 			<File
-				RelativePath="gui\chooser.cpp">
+				RelativePath="..\..\gui\chooser.cpp">
 			</File>
 			<File
-				RelativePath="gui\chooser.h">
+				RelativePath="..\..\gui\chooser.h">
 			</File>
 			<File
-				RelativePath="gui\console.cpp">
+				RelativePath="..\..\gui\console.cpp">
 			</File>
 			<File
-				RelativePath="gui\console.h">
+				RelativePath="..\..\gui\console.h">
 			</File>
 			<File
-				RelativePath="gui\dialog.cpp">
+				RelativePath="..\..\gui\dialog.cpp">
 			</File>
 			<File
-				RelativePath="gui\dialog.h">
+				RelativePath="..\..\gui\dialog.h">
 			</File>
 			<File
-				RelativePath="gui\launcher.cpp">
+				RelativePath="..\..\gui\launcher.cpp">
 			</File>
 			<File
-				RelativePath="gui\launcher.h">
+				RelativePath="..\..\gui\launcher.h">
 			</File>
 			<File
-				RelativePath="gui\message.cpp">
+				RelativePath="..\..\gui\message.cpp">
 			</File>
 			<File
-				RelativePath="gui\message.h">
+				RelativePath="..\..\gui\message.h">
 			</File>
 			<File
-				RelativePath="gui\newgui.cpp">
+				RelativePath="..\..\gui\newgui.cpp">
 			</File>
 			<File
-				RelativePath="gui\newgui.h">
+				RelativePath="..\..\gui\newgui.h">
 			</File>
 			<File
-				RelativePath="gui\options.cpp">
+				RelativePath="..\..\gui\options.cpp">
 			</File>
 			<File
-				RelativePath="gui\options.h">
+				RelativePath="..\..\gui\options.h">
 			</File>
 			<File
-				RelativePath="gui\widget.cpp">
+				RelativePath="..\..\gui\widget.cpp">
 			</File>
 			<File
-				RelativePath="gui\widget.h">
+				RelativePath="..\..\gui\widget.h">
 			</File>
 		</Filter>
 	</Files>
diff --git a/simon.vcproj b/dists/msvc7/simon.vcproj
index 11ee764f77..4d74f66f03 100644
--- a/simon.vcproj
+++ b/dists/msvc7/simon.vcproj
@@ -12,14 +12,14 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="vc7_out/simon_Debug"
-			IntermediateDirectory="vc7_out/simon_Debug"
+			OutputDirectory="simon_Debug"
+			IntermediateDirectory="simon_Debug"
 			ConfigurationType="4"
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="."
+				AdditionalIncludeDirectories="../../;../../common"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;USE_ADLIB"
 				MinimalRebuild="TRUE"
 				ExceptionHandling="FALSE"
@@ -53,18 +53,18 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="vc7_out/simon_Release"
-			IntermediateDirectory="vc7_out/simon_Release"
+			OutputDirectory="simon_Release"
+			IntermediateDirectory="simon_Release"
 			ConfigurationType="4"
 			ATLMinimizesCRunTimeLibraryUsage="TRUE"
 			CharacterSet="2"
-			WholeProgramOptimization="TRUE">
+			WholeProgramOptimization="FALSE">
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="."
+				AdditionalIncludeDirectories="../../;../../common"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;USE_ADLIB"
 				StringPooling="TRUE"
 				ExceptionHandling="FALSE"
@@ -97,52 +97,52 @@
 	</Configurations>
 	<Files>
 		<File
-			RelativePath="simon\charset.cpp">
+			RelativePath="..\..\simon\charset.cpp">
 		</File>
 		<File
-			RelativePath="simon\debug.cpp">
+			RelativePath="..\..\simon\debug.cpp">
 		</File>
 		<File
-			RelativePath="simon\debug.h">
+			RelativePath="..\..\simon\debug.h">
 		</File>
 		<File
-			RelativePath="simon\intern.h">
+			RelativePath="..\..\simon\intern.h">
 		</File>
 		<File
-			RelativePath="simon\items.cpp">
+			RelativePath="..\..\simon\items.cpp">
 		</File>
 		<File
-			RelativePath="simon\midi.cpp">
+			RelativePath="..\..\simon\midi.cpp">
 		</File>
 		<File
-			RelativePath="simon\midi.h">
+			RelativePath="..\..\simon\midi.h">
 		</File>
 		<File
-			RelativePath="simon\midiparser_s1d.cpp">
+			RelativePath="..\..\simon\midiparser_s1d.cpp">
 		</File>
 		<File
-			RelativePath="simon\res.cpp">
+			RelativePath="..\..\simon\res.cpp">
 		</File>
 		<File
-			RelativePath="simon\simon.cpp">
+			RelativePath="..\..\simon\simon.cpp">
 		</File>
 		<File
-			RelativePath="simon\simon.h">
+			RelativePath="..\..\simon\simon.h">
 		</File>
 		<File
-			RelativePath="simon\sound.cpp">
+			RelativePath="..\..\simon\sound.cpp">
 		</File>
 		<File
-			RelativePath="simon\sound.h">
+			RelativePath="..\..\simon\sound.h">
 		</File>
 		<File
-			RelativePath="simon\verb.cpp">
+			RelativePath="..\..\simon\verb.cpp">
 		</File>
 		<File
-			RelativePath="simon\vga.cpp">
+			RelativePath="..\..\simon\vga.cpp">
 		</File>
 		<File
-			RelativePath="simon\vga.h">
+			RelativePath="..\..\simon\vga.h">
 		</File>
 	</Files>
 	<Globals>
diff --git a/dists/msvc7/sky.vcproj b/dists/msvc7/sky.vcproj
new file mode 100644
index 0000000000..bcd3cc35b0
--- /dev/null
+++ b/dists/msvc7/sky.vcproj
@@ -0,0 +1,473 @@
+<?xml version="1.0" encoding = "windows-1250"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.00"
+	Name="sky"
+	ProjectGUID="{B5527758-2F51-4CCD-AAE1-B0E28654BD6A}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="sky_Debug"
+			IntermediateDirectory="sky_Debug"
+			ConfigurationType="4"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../../;../../common"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;USE_ADLIB"
+				MinimalRebuild="TRUE"
+				ExceptionHandling="FALSE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="TRUE"
+				EnableFunctionLevelLinking="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				WarnAsError="TRUE"
+				SuppressStartupBanner="FALSE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)/sky.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="sky_Release"
+			IntermediateDirectory="sky_Release"
+			ConfigurationType="4"
+			CharacterSet="2"
+			WholeProgramOptimization="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				OmitFramePointers="TRUE"
+				AdditionalIncludeDirectories="../../;../../common"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;USE_ADLIB"
+				StringPooling="TRUE"
+				ExceptionHandling="FALSE"
+				RuntimeLibrary="0"
+				BufferSecurityCheck="FALSE"
+				EnableFunctionLevelLinking="FALSE"
+				DisableLanguageExtensions="FALSE"
+				ForceConformanceInForLoopScope="TRUE"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				WarnAsError="TRUE"
+				DebugInformationFormat="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)/sky.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<Files>
+		<Filter
+			Name="music"
+			Filter="">
+			<File
+				RelativePath="..\..\sky\music\adlibchannel.cpp">
+			</File>
+			<File
+				RelativePath="..\..\sky\music\adlibchannel.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\music\adlibmusic.cpp">
+			</File>
+			<File
+				RelativePath="..\..\sky\music\adlibmusic.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\music\gmchannel.cpp">
+			</File>
+			<File
+				RelativePath="..\..\sky\music\gmchannel.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\music\gmmusic.cpp">
+			</File>
+			<File
+				RelativePath="..\..\sky\music\gmmusic.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\music\mt32music.cpp">
+			</File>
+			<File
+				RelativePath="..\..\sky\music\mt32music.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\music\musicbase.cpp">
+			</File>
+			<File
+				RelativePath="..\..\sky\music\musicbase.h">
+			</File>
+		</Filter>
+		<Filter
+			Name="compacts"
+			Filter="">
+			<File
+				RelativePath="..\..\sky\compacts\0compact.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\101comp.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\102comp.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\10comp.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\11comp.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\12comp.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\13comp.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\14comp.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\15comp.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\16comp.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\17comp.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\18comp.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\19comp.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\1compact.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\20comp.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\21comp.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\22comp.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\23comp.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\24comp.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\25comp.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\26comp.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\27comp.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\28comp.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\29comp.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\2compact.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\30comp.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\31comp.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\32comp.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\33comp.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\34comp.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\36comp.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\37comp.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\38comp.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\39comp.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\3compact.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\40comp.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\41comp.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\42comp.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\44comp.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\45comp.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\46comp.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\47comp.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\48comp.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\4compact.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\5compact.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\65comp.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\66comp.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\67comp.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\68comp.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\69comp.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\70comp.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\71comp.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\72comp.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\73comp.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\74comp.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\75comp.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\76comp.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\77comp.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\78comp.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\79comp.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\80comp.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\81comp.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\82comp.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\85comp.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\90comp.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\91comp.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\92comp.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\93comp.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\94comp.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\95comp.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\96comp.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\9compact.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\linc_gen.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\lincmenu.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\objects.h">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\savedata.cpp">
+			</File>
+			<File
+				RelativePath="..\..\sky\compacts\z_compac.h">
+			</File>
+		</Filter>
+		<File
+			RelativePath="..\..\sky\autoroute.cpp">
+		</File>
+		<File
+			RelativePath="..\..\sky\autoroute.h">
+		</File>
+		<File
+			RelativePath="..\..\sky\compact.cpp">
+		</File>
+		<File
+			RelativePath="..\..\sky\compact.h">
+		</File>
+		<File
+			RelativePath="..\..\sky\control.cpp">
+		</File>
+		<File
+			RelativePath="..\..\sky\control.h">
+		</File>
+		<File
+			RelativePath="..\..\sky\debug.cpp">
+		</File>
+		<File
+			RelativePath="..\..\sky\debug.h">
+		</File>
+		<File
+			RelativePath="..\..\sky\disk.cpp">
+		</File>
+		<File
+			RelativePath="..\..\sky\disk.h">
+		</File>
+		<File
+			RelativePath="..\..\sky\grid.cpp">
+		</File>
+		<File
+			RelativePath="..\..\sky\grid.h">
+		</File>
+		<File
+			RelativePath="..\..\sky\hufftext.cpp">
+		</File>
+		<File
+			RelativePath="..\..\sky\intro.cpp">
+		</File>
+		<File
+			RelativePath="..\..\sky\intro.h">
+		</File>
+		<File
+			RelativePath="..\..\sky\logic.cpp">
+		</File>
+		<File
+			RelativePath="..\..\sky\logic.h">
+		</File>
+		<File
+			RelativePath="..\..\sky\mouse.cpp">
+		</File>
+		<File
+			RelativePath="..\..\sky\mouse.h">
+		</File>
+		<File
+			RelativePath="..\..\sky\rnc_deco.cpp">
+		</File>
+		<File
+			RelativePath="..\..\sky\rnc_deco.h">
+		</File>
+		<File
+			RelativePath="..\..\sky\screen.cpp">
+		</File>
+		<File
+			RelativePath="..\..\sky\screen.h">
+		</File>
+		<File
+			RelativePath="..\..\sky\sky.cpp">
+		</File>
+		<File
+			RelativePath="..\..\sky\sky.h">
+		</File>
+		<File
+			RelativePath="..\..\sky\skydefs.h">
+		</File>
+		<File
+			RelativePath="..\..\sky\sound.cpp">
+		</File>
+		<File
+			RelativePath="..\..\sky\sound.h">
+		</File>
+		<File
+			RelativePath="..\..\sky\struc.h">
+		</File>
+		<File
+			RelativePath="..\..\sky\talks.h">
+		</File>
+		<File
+			RelativePath="..\..\sky\text.cpp">
+		</File>
+		<File
+			RelativePath="..\..\sky\text.h">
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/scumm.vcproj b/scumm.vcproj
deleted file mode 100644
index 9ca59ee4a5..0000000000
--- a/scumm.vcproj
+++ /dev/null
@@ -1,380 +0,0 @@
-<?xml version="1.0" encoding = "windows-1250"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.00"
-	Name="scumm"
-	ProjectGUID="{B6AFD548-63D2-40CD-A652-E87095AFCBAF}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="vc7_out/scumm_Debug"
-			IntermediateDirectory="vc7_out/scumm_Debug"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="FALSE">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="."
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;USE_ADLIB;BYPASS_COPY_PROT"
-				MinimalRebuild="TRUE"
-				ExceptionHandling="FALSE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="TRUE"
-				EnableFunctionLevelLinking="TRUE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="TRUE"
-				SuppressStartupBanner="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/scumm.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="vc7_out/scumm_Release"
-			IntermediateDirectory="vc7_out/scumm_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="TRUE">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="."
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;USE_ADLIB;BYPASS_COPY_PROT"
-				StringPooling="TRUE"
-				ExceptionHandling="FALSE"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="FALSE"
-				EnableFunctionLevelLinking="FALSE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="TRUE"
-				DebugInformationFormat="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/scumm.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<Files>
-		<Filter
-			Name="smush"
-			Filter="">
-			<File
-				RelativePath="scumm\smush\channel.h">
-			</File>
-			<File
-				RelativePath="scumm\smush\chunk.cpp">
-			</File>
-			<File
-				RelativePath="scumm\smush\chunk.h">
-			</File>
-			<File
-				RelativePath="scumm\smush\chunk_type.h">
-			</File>
-			<File
-				RelativePath="scumm\smush\codec1.cpp">
-			</File>
-			<File
-				RelativePath="scumm\smush\codec37.cpp">
-			</File>
-			<File
-				RelativePath="scumm\smush\codec37.h">
-			</File>
-			<File
-				RelativePath="scumm\smush\codec47.cpp">
-			</File>
-			<File
-				RelativePath="scumm\smush\codec47.h">
-			</File>
-			<File
-				RelativePath="scumm\smush\imuse_channel.cpp">
-			</File>
-			<File
-				RelativePath="scumm\smush\saud_channel.cpp">
-			</File>
-			<File
-				RelativePath="scumm\smush\smush_font.cpp">
-			</File>
-			<File
-				RelativePath="scumm\smush\smush_font.h">
-			</File>
-			<File
-				RelativePath="scumm\smush\smush_mixer.cpp">
-			</File>
-			<File
-				RelativePath="scumm\smush\smush_mixer.h">
-			</File>
-			<File
-				RelativePath="scumm\smush\smush_player.cpp">
-			</File>
-			<File
-				RelativePath="scumm\smush\smush_player.h">
-			</File>
-		</Filter>
-		<File
-			RelativePath="scumm\actor.cpp">
-		</File>
-		<File
-			RelativePath="scumm\actor.h">
-		</File>
-		<File
-			RelativePath="scumm\akos.cpp">
-		</File>
-		<File
-			RelativePath="scumm\akos.h">
-		</File>
-		<File
-			RelativePath="scumm\base-costume.cpp">
-		</File>
-		<File
-			RelativePath="scumm\base-costume.h">
-		</File>
-		<File
-			RelativePath="scumm\bomp.cpp">
-		</File>
-		<File
-			RelativePath="scumm\bomp.h">
-		</File>
-		<File
-			RelativePath="scumm\boxes.cpp">
-		</File>
-		<File
-			RelativePath="scumm\boxes.h">
-		</File>
-		<File
-			RelativePath="scumm\bundle.cpp">
-		</File>
-		<File
-			RelativePath="scumm\bundle.h">
-		</File>
-		<File
-			RelativePath="scumm\camera.cpp">
-		</File>
-		<File
-			RelativePath="scumm\charset.cpp">
-		</File>
-		<File
-			RelativePath="scumm\charset.h">
-		</File>
-		<File
-			RelativePath="scumm\costume.cpp">
-		</File>
-		<File
-			RelativePath="scumm\costume.h">
-		</File>
-		<File
-			RelativePath="scumm\debugger.cpp">
-		</File>
-		<File
-			RelativePath="scumm\debugger.h">
-		</File>
-		<File
-			RelativePath="scumm\dialogs.cpp">
-		</File>
-		<File
-			RelativePath="scumm\dialogs.h">
-		</File>
-		<File
-			RelativePath="scumm\gfx.cpp">
-		</File>
-		<File
-			RelativePath="scumm\gfx.h">
-		</File>
-		<File
-			RelativePath="scumm\help.cpp">
-		</File>
-		<File
-			RelativePath="scumm\help.h">
-		</File>
-		<File
-			RelativePath="scumm\imuse.cpp">
-		</File>
-		<File
-			RelativePath="scumm\imuse.h">
-		</File>
-		<File
-			RelativePath="scumm\imuse_digi.cpp">
-		</File>
-		<File
-			RelativePath="scumm\imuse_digi.h">
-		</File>
-		<File
-			RelativePath="scumm\imuse_internal.h">
-		</File>
-		<File
-			RelativePath="scumm\imuse_player.cpp">
-		</File>
-		<File
-			RelativePath="scumm\instrument.cpp">
-		</File>
-		<File
-			RelativePath="scumm\instrument.h">
-		</File>
-		<File
-			RelativePath="scumm\intern.h">
-		</File>
-		<File
-			RelativePath="scumm\midiparser_eup.cpp">
-		</File>
-		<File
-			RelativePath="scumm\midiparser_ro.cpp">
-		</File>
-		<File
-			RelativePath="scumm\music.h">
-		</File>
-		<File
-			RelativePath="scumm\nut_renderer.cpp">
-		</File>
-		<File
-			RelativePath="scumm\nut_renderer.h">
-		</File>
-		<File
-			RelativePath="scumm\object.cpp">
-		</File>
-		<File
-			RelativePath="scumm\object.h">
-		</File>
-		<File
-			RelativePath="scumm\player_mod.cpp">
-		</File>
-		<File
-			RelativePath="scumm\player_mod.h">
-		</File>
-		<File
-			RelativePath="scumm\player_v1.cpp">
-		</File>
-		<File
-			RelativePath="scumm\player_v1.h">
-		</File>
-		<File
-			RelativePath="scumm\player_v2.cpp">
-		</File>
-		<File
-			RelativePath="scumm\player_v2.h">
-		</File>
-		<File
-			RelativePath="scumm\player_v2a.cpp">
-		</File>
-		<File
-			RelativePath="scumm\player_v2a.h">
-		</File>
-		<File
-			RelativePath="scumm\player_v3a.cpp">
-		</File>
-		<File
-			RelativePath="scumm\player_v3a.h">
-		</File>
-		<File
-			RelativePath="scumm\resource.cpp">
-		</File>
-		<File
-			RelativePath="scumm\resource.h">
-		</File>
-		<File
-			RelativePath="scumm\resource_v2.cpp">
-		</File>
-		<File
-			RelativePath="scumm\resource_v3.cpp">
-		</File>
-		<File
-			RelativePath="scumm\resource_v4.cpp">
-		</File>
-		<File
-			RelativePath="scumm\saveload.cpp">
-		</File>
-		<File
-			RelativePath="scumm\saveload.h">
-		</File>
-		<File
-			RelativePath="scumm\script.cpp">
-		</File>
-		<File
-			RelativePath="scumm\script.h">
-		</File>
-		<File
-			RelativePath="scumm\script_v2.cpp">
-		</File>
-		<File
-			RelativePath="scumm\script_v5.cpp">
-		</File>
-		<File
-			RelativePath="scumm\script_v6.cpp">
-		</File>
-		<File
-			RelativePath="scumm\script_v8.cpp">
-		</File>
-		<File
-			RelativePath="scumm\scumm.h">
-		</File>
-		<File
-			RelativePath="scumm\scummvm.cpp">
-		</File>
-		<File
-			RelativePath="scumm\sound.cpp">
-		</File>
-		<File
-			RelativePath="scumm\sound.h">
-		</File>
-		<File
-			RelativePath="scumm\string.cpp">
-		</File>
-		<File
-			RelativePath="scumm\usage_bits.cpp">
-		</File>
-		<File
-			RelativePath="scumm\usage_bits.h">
-		</File>
-		<File
-			RelativePath="scumm\vars.cpp">
-		</File>
-		<File
-			RelativePath="scumm\verbs.cpp">
-		</File>
-		<File
-			RelativePath="scumm\verbs.h">
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/sky.vcproj b/sky.vcproj
deleted file mode 100644
index 1a5b6dbfdb..0000000000
--- a/sky.vcproj
+++ /dev/null
@@ -1,473 +0,0 @@
-<?xml version="1.0" encoding = "windows-1250"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.00"
-	Name="sky"
-	ProjectGUID="{B5527758-2F51-4CCD-AAE1-B0E28654BD6A}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="vc7_out/sky_Debug"
-			IntermediateDirectory="vc7_out/sky_Debug"
-			ConfigurationType="4"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="."
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;USE_ADLIB"
-				MinimalRebuild="TRUE"
-				ExceptionHandling="FALSE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="TRUE"
-				EnableFunctionLevelLinking="TRUE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="TRUE"
-				SuppressStartupBanner="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/sky.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="vc7_out/sky_Release"
-			IntermediateDirectory="vc7_out/sky_Release"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="TRUE">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="."
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;USE_ADLIB"
-				StringPooling="TRUE"
-				ExceptionHandling="FALSE"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="FALSE"
-				EnableFunctionLevelLinking="FALSE"
-				DisableLanguageExtensions="FALSE"
-				ForceConformanceInForLoopScope="TRUE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="TRUE"
-				DebugInformationFormat="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/sky.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<Files>
-		<Filter
-			Name="music"
-			Filter="">
-			<File
-				RelativePath="sky\music\adlibchannel.cpp">
-			</File>
-			<File
-				RelativePath="sky\music\adlibchannel.h">
-			</File>
-			<File
-				RelativePath="sky\music\adlibmusic.cpp">
-			</File>
-			<File
-				RelativePath="sky\music\adlibmusic.h">
-			</File>
-			<File
-				RelativePath="sky\music\gmchannel.cpp">
-			</File>
-			<File
-				RelativePath="sky\music\gmchannel.h">
-			</File>
-			<File
-				RelativePath="sky\music\gmmusic.cpp">
-			</File>
-			<File
-				RelativePath="sky\music\gmmusic.h">
-			</File>
-			<File
-				RelativePath="sky\music\mt32music.cpp">
-			</File>
-			<File
-				RelativePath="sky\music\mt32music.h">
-			</File>
-			<File
-				RelativePath="sky\music\musicbase.cpp">
-			</File>
-			<File
-				RelativePath="sky\music\musicbase.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="compacts"
-			Filter="">
-			<File
-				RelativePath="sky\compacts\0compact.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\101comp.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\102comp.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\10comp.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\11comp.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\12comp.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\13comp.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\14comp.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\15comp.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\16comp.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\17comp.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\18comp.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\19comp.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\1compact.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\20comp.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\21comp.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\22comp.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\23comp.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\24comp.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\25comp.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\26comp.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\27comp.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\28comp.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\29comp.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\2compact.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\30comp.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\31comp.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\32comp.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\33comp.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\34comp.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\36comp.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\37comp.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\38comp.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\39comp.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\3compact.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\40comp.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\41comp.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\42comp.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\44comp.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\45comp.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\46comp.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\47comp.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\48comp.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\4compact.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\5compact.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\65comp.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\66comp.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\67comp.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\68comp.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\69comp.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\70comp.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\71comp.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\72comp.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\73comp.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\74comp.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\75comp.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\76comp.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\77comp.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\78comp.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\79comp.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\80comp.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\81comp.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\82comp.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\85comp.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\90comp.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\91comp.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\92comp.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\93comp.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\94comp.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\95comp.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\96comp.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\9compact.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\linc_gen.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\lincmenu.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\objects.h">
-			</File>
-			<File
-				RelativePath="sky\compacts\savedata.cpp">
-			</File>
-			<File
-				RelativePath="sky\compacts\z_compac.h">
-			</File>
-		</Filter>
-		<File
-			RelativePath="sky\autoroute.cpp">
-		</File>
-		<File
-			RelativePath="sky\autoroute.h">
-		</File>
-		<File
-			RelativePath="sky\compact.cpp">
-		</File>
-		<File
-			RelativePath="sky\compact.h">
-		</File>
-		<File
-			RelativePath="sky\control.cpp">
-		</File>
-		<File
-			RelativePath="sky\control.h">
-		</File>
-		<File
-			RelativePath="sky\debug.cpp">
-		</File>
-		<File
-			RelativePath="sky\debug.h">
-		</File>
-		<File
-			RelativePath="sky\disk.cpp">
-		</File>
-		<File
-			RelativePath="sky\disk.h">
-		</File>
-		<File
-			RelativePath="sky\grid.cpp">
-		</File>
-		<File
-			RelativePath="sky\grid.h">
-		</File>
-		<File
-			RelativePath="sky\hufftext.cpp">
-		</File>
-		<File
-			RelativePath="sky\intro.cpp">
-		</File>
-		<File
-			RelativePath="sky\intro.h">
-		</File>
-		<File
-			RelativePath="sky\logic.cpp">
-		</File>
-		<File
-			RelativePath="sky\logic.h">
-		</File>
-		<File
-			RelativePath="sky\mouse.cpp">
-		</File>
-		<File
-			RelativePath="sky\mouse.h">
-		</File>
-		<File
-			RelativePath="sky\rnc_deco.cpp">
-		</File>
-		<File
-			RelativePath="sky\rnc_deco.h">
-		</File>
-		<File
-			RelativePath="sky\screen.cpp">
-		</File>
-		<File
-			RelativePath="sky\screen.h">
-		</File>
-		<File
-			RelativePath="sky\sky.cpp">
-		</File>
-		<File
-			RelativePath="sky\sky.h">
-		</File>
-		<File
-			RelativePath="sky\skydefs.h">
-		</File>
-		<File
-			RelativePath="sky\sound.cpp">
-		</File>
-		<File
-			RelativePath="sky\sound.h">
-		</File>
-		<File
-			RelativePath="sky\struc.h">
-		</File>
-		<File
-			RelativePath="sky\talks.h">
-		</File>
-		<File
-			RelativePath="sky\text.cpp">
-		</File>
-		<File
-			RelativePath="sky\text.h">
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>