aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--scumm.dsp480
-rw-r--r--scummvm.dsp482
-rw-r--r--scummvm.dsw74
-rw-r--r--simon.dsp197
-rw-r--r--sky.dsp171
-rw-r--r--sky/disk.cpp3
-rw-r--r--sky/intro.cpp1
-rw-r--r--sky/rnc_deco.cpp5
-rw-r--r--sky/sky.cpp1
9 files changed, 1411 insertions, 3 deletions
diff --git a/scumm.dsp b/scumm.dsp
new file mode 100644
index 0000000000..5efcde8aaa
--- /dev/null
+++ b/scumm.dsp
@@ -0,0 +1,480 @@
+# 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 MP3 Enabled 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 MP3 Enabled Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "scumm - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "scumm - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "scumm - Win32 MP3 Enabled Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "scumm - Win32 MP3 Enabled Release" (based on "Win32 (x86) Static Library")
+!MESSAGE
+
+# 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 /O2 /I "." /I "common" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "USE_ADLIB" /D "BYPASS_COPY_PROT" /YX /FD /c
+# SUBTRACT CPP /Z<none>
+# 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 /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 MP3 Enabled Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "scumm___Win32_MP3_Enabled_Debug"
+# PROP BASE Intermediate_Dir "scumm___Win32_MP3_Enabled_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "scumm___MP3_Enabled_Debug"
+# PROP Intermediate_Dir "scumm___MP3_Enabled_Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "." /I "common" /I "scumm" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "BYPASS_COPY_PROT" /D "USE_ADLIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /WX /Gm /GX /ZI /Od /I "." /I "common" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "USE_ADLIB" /D "BYPASS_COPY_PROT" /D "USE_MAD" /YX /FD /GZ /c
+# ADD 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 MP3 Enabled Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "scumm___Win32_MP3_Enabled_Release"
+# PROP BASE Intermediate_Dir "scumm___Win32_MP3_Enabled_Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "scumm___MP3_Enabled_Release"
+# PROP Intermediate_Dir "scumm___MP3_Enabled_Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /I "." /I "common" /I "scumm" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "USE_ADLIB" /YX /FD /c
+# ADD CPP /nologo /G6 /MT /W3 /WX /GX /O2 /I "." /I "common" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "USE_ADLIB" /D "BYPASS_COPY_PROT" /D "USE_MAD" /YX /FD /c
+# SUBTRACT CPP /Z<none>
+# 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 MP3 Enabled Debug"
+# Name "scumm - Win32 MP3 Enabled 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\blitter.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\scumm\smush\blitter.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\scumm\smush\brenderer.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\scumm\smush\brenderer.h
+# End Source File
+# 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\codec1.h
+# 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\codec44.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\scumm\smush\codec44.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\color.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\scumm\smush\color.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\scumm\smush\config.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\scumm\smush\decoder.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\scumm\smush\frenderer.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\scumm\smush\frenderer.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\scumm\smush\imuse_channel.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\scumm\smush\mixer.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\scumm\smush\palette.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\scumm\smush\player.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\scumm\smush\player.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\scumm\smush\renderer.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\scumm\smush\saud_channel.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\scumm\smush\scumm_renderer.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\scumm\smush\scumm_renderer.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.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\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\debugrl.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\scumm\debugrl.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\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\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\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\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_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/scummvm.dsp
new file mode 100644
index 0000000000..79c40fd470
--- /dev/null
+++ b/scummvm.dsp
@@ -0,0 +1,482 @@
+# 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 MP3 Enabled 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 MP3 Enabled 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 MP3 Enabled Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "scummvm - Win32 MP3 Enabled 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 /O2 /Ob2 /I "." /I "sound" /I "common" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "USE_ADLIB" /D "BYPASS_COPY_PROT" /FD /c
+# SUBTRACT CPP /Z<none> /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 /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 /GX /ZI /Od /I "." /I "sound" /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 /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc" /pdbtype:sept /fixed:no
+# SUBTRACT LINK32 /pdb:none
+
+!ELSEIF "$(CFG)" == "scummvm - Win32 MP3 Enabled Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "scummvm___Win32_MP3_Enabled_Debug"
+# PROP BASE Intermediate_Dir "scummvm___Win32_MP3_Enabled_Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "scummvm___MP3_Enabled_Debug"
+# PROP Intermediate_Dir "scummvm___MP3_Enabled_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 "sound" /I "common" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "ALLOW_GDI" /D "USE_ADLIB" /D "BYPASS_COPY_PROT" /D "USE_MAD" /YX /FD /GZ /c
+# SUBTRACT CPP /Fr
+# ADD BASE RSC /l 0x41d /d "_DEBUG"
+# ADD RSC /l 0x41d /d "_DEBUG"
+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___MP3_Enabled_Debug\scumm.lib simon___MP3_Enabled_Debug\simon.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc" /nodefaultlib:"libcd" /pdbtype:sept /fixed:no
+# SUBTRACT LINK32 /pdb:none
+
+!ELSEIF "$(CFG)" == "scummvm - Win32 MP3 Enabled Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "scummvm___Win32_MP3_Enabled_Release"
+# PROP BASE Intermediate_Dir "scummvm___Win32_MP3_Enabled_Release"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "scummvm___MP3_Enabled_Release"
+# PROP Intermediate_Dir "scummvm___MP3_Enabled_Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /G6 /MD /W3 /O2 /Ob2 /I "." /I "sound" /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 /O2 /Ob2 /I "." /I "sound" /I "common" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "USE_ADLIB" /D "BYPASS_COPY_PROT" /D "USE_MAD" /FD /c
+# SUBTRACT CPP /Z<none> /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___MP3_Enabled_Release\scumm.lib simon___MP3_Enabled_Release\simon.lib /nologo /subsystem:console /incremental:yes /debug /machine:I386 /nodefaultlib:"libc" /nodefaultlib:"libcd"
+# SUBTRACT LINK32 /pdb:none
+
+!ENDIF
+
+# Begin Target
+
+# Name "scummvm - Win32 Release"
+# Name "scummvm - Win32 Debug"
+# Name "scummvm - Win32 MP3 Enabled Debug"
+# Name "scummvm - Win32 MP3 Enabled Release"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Group "common"
+
+# PROP Default_Filter ""
+# 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\engine.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\common\engine.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\gameDetector.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\common\gameDetector.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\common\list.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\common\main.cpp
+# 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\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.cpp
+# 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\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\midistreamer.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\sound\midistreamer.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\sound\mixer.cpp
+# 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
+# End Group
+# Begin Group "gui"
+
+# PROP Default_Filter ""
+# 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\alsa.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\backends\midi\coreaudio.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\backends\midi\null.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\backends\midi\quicktime.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/scummvm.dsw
new file mode 100644
index 0000000000..b36134aa37
--- /dev/null
+++ b/scummvm.dsw
@@ -0,0 +1,74 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+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
+}}}
+
+###############################################################################
+
+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/simon.dsp
new file mode 100644
index 0000000000..43a0089ade
--- /dev/null
+++ b/simon.dsp
@@ -0,0 +1,197 @@
+# 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 MP3 Enabled 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 MP3 Enabled 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 MP3 Enabled Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "simon - Win32 MP3 Enabled 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 /O2 /I "." /I "common" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "USE_ADLIB" /D "BYPASS_COPY_PROT" /YX /FD /c
+# SUBTRACT CPP /Z<none>
+# 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 /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 MP3 Enabled 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___MP3_Enabled_Debug"
+# PROP Intermediate_Dir "simon___MP3_Enabled_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" /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 MP3 Enabled 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___MP3_Enabled_Release"
+# PROP Intermediate_Dir "simon___MP3_Enabled_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 /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
+# SUBTRACT CPP /Z<none>
+# 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 MP3 Enabled Debug"
+# Name "simon - Win32 MP3 Enabled Release"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# 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\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/sky.dsp
new file mode 100644
index 0000000000..a5dcecdf7a
--- /dev/null
+++ b/sky.dsp
@@ -0,0 +1,171 @@
+# 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 MP3 Enabled 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 MP3 Enabled 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 MP3 Enabled Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "sky - Win32 MP3 Enabled 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 /GX /O2 /I "." /I "common" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# SUBTRACT CPP /Z<none>
+# 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 /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 MP3 Enabled 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___MP3_Enabled_Debug"
+# PROP Intermediate_Dir "sky___MP3_Enabled_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" /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 MP3 Enabled 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___MP3_Enabled_Release"
+# PROP Intermediate_Dir "sky___MP3_Enabled_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 /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 MP3 Enabled Debug"
+# Name "sky - Win32 MP3 Enabled Release"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\sky\disk.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\sky\intro.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\sky\rnc_deco.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\sky\screen.cpp
+# 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\struc.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/sky/disk.cpp b/sky/disk.cpp
index 8649b699b3..74ac73fd21 100644
--- a/sky/disk.cpp
+++ b/sky/disk.cpp
@@ -19,6 +19,7 @@
*
*/
+#include "stdafx.h"
#include "common/scummsys.h"
#include "common/engine.h"
#include "common/file.h"
@@ -29,7 +30,7 @@
#define no_of_files_cd 5200
#define max_files_in_list 60
-extern uint16 UnpackM1(void *, void *, uint16);
+uint32 UnpackM1(void *, void *, uint16);
const char *data_file_name = "sky.dsk";
const char *dinner_file_name = "sky.dnr";
diff --git a/sky/intro.cpp b/sky/intro.cpp
index b13d8ebece..17e88edb5c 100644
--- a/sky/intro.cpp
+++ b/sky/intro.cpp
@@ -19,6 +19,7 @@
*
*/
+#include "stdafx.h"
#include <string.h>
#include "common/scummsys.h"
#include "sky/skydefs.h"
diff --git a/sky/rnc_deco.cpp b/sky/rnc_deco.cpp
index fbfd1d3caa..0cac411089 100644
--- a/sky/rnc_deco.cpp
+++ b/sky/rnc_deco.cpp
@@ -19,6 +19,7 @@
*
*/
+#include "stdafx.h"
#include <string.h>
#include "common/scummsys.h"
@@ -110,7 +111,7 @@ uint16 input_bits(uint8 amount)
{
uint16 newBitBuffh = bit_buffh;
uint16 newBitBuffl = bit_buffl;
- int16 newBitCount = bit_count;
+ int8 newBitCount = bit_count;
uint16 remBits, returnVal;
returnVal = ((1 << amount) - 1) & newBitBuffl;
@@ -195,7 +196,7 @@ uint16 input_value(uint16 *table)
return value;
}
-int UnpackM1(void *input, void *output, uint16 key)
+uint32 UnpackM1(void *input, void *output, uint16 key)
{
uint8 cl;
uint8 *inputHigh, *outputLow;
diff --git a/sky/sky.cpp b/sky/sky.cpp
index 2006c9aead..414c222e6a 100644
--- a/sky/sky.cpp
+++ b/sky/sky.cpp
@@ -19,6 +19,7 @@
*
*/
+#include "stdafx.h"
#include "sky/sky.h"
#include "sky/skydefs.h" //game specific defines
#include "common/file.h"
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-21 08:13:31 +0000