3 files changed, 10 insertions, 58 deletions
diff --git a/Makefile.common b/Makefile.common
index 4ad756ff08..0ef447dcd2 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -10,7 +10,7 @@ DISTFILES := \
 	Makefile Makefile.common Makefile.mingw \
 	NEWS README COPYING scummvm.6 Info.plist \
 	scumm.dsp  scummvm.dsp scummvm.dsw scummvm.icns scummvm.ico \
-	scummvm.proj scummvm.rc scummvm.spec scummvm.xpm simon.dsp
+	scummvm.proj scummvm.rc scummvm.spec scummvm.xpm simon.dsp sky.dsp
 
 # The dist file name
 ZIPFILE := scummvm-`date '+%Y-%m-%d'`.zip
diff --git a/scumm.dsp b/scumm.dsp
index df07005a5a..7d8b718c28 100644
--- a/scumm.dsp
+++ b/scumm.dsp
@@ -138,14 +138,6 @@ LIB32=link.exe -lib
 # PROP Default_Filter ""
 # 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
@@ -166,10 +158,6 @@ 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
@@ -178,14 +166,6 @@ 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
@@ -194,63 +174,35 @@ 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
+SOURCE=.\scumm\smush\saud_channel.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\scumm\smush\player.cpp
+SOURCE=.\scumm\smush\smush_font.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\scumm\smush\player.h
+SOURCE=.\scumm\smush\smush_font.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\scumm\smush\renderer.h
+SOURCE=.\scumm\smush\smush_mixer.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\scumm\smush\saud_channel.cpp
+SOURCE=.\scumm\smush\smush_mixer.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\scumm\smush\scumm_renderer.cpp
+SOURCE=.\scumm\smush\smush_player.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\scumm\smush\scumm_renderer.h
+SOURCE=.\scumm\smush\smush_player.h
 # End Source File
 # End Group
 # Begin Source File
diff --git a/scummvm.dsp b/scummvm.dsp
index 80a3995b68..9e68b7274c 100644
--- a/scummvm.dsp
+++ b/scummvm.dsp
@@ -45,7 +45,7 @@ RSC=rc.exe
 # 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
+# SUBTRACT CPP /YX /Yc /Yu
 # ADD BASE RSC /l 0x41d /d "NDEBUG"
 # ADD RSC /l 0x41d /d "NDEBUG"
 BSC32=bscmake.exe
@@ -127,7 +127,7 @@ LINK32=link.exe
 # 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
+# SUBTRACT CPP /YX /Yc /Yu
 # ADD BASE RSC /l 0x41d /d "NDEBUG"
 # ADD RSC /l 0x41d /d "NDEBUG"
 BSC32=bscmake.exe