updated msvc7 project files

svn-id: r20830

6 files changed, 517 insertions, 159 deletions

diff --git a/dists/msvc8/cine.vcproj b/dists/msvc8/cine.vcproj
new file mode 100644
index 0000000000..3faaf8f9d9
--- /dev/null
+++ b/dists/msvc8/cine.vcproj
@@ -0,0 +1,340 @@
+<?xml version="1.0" encoding="windows-1250"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8,00"
+	Name="cine"
+	ProjectGUID="{1CA4AC50-5426-433A-8B5E-FFE39568098E}"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="cine_Debug"
+			IntermediateDirectory="cine_Debug"
+			ConfigurationType="4"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
+				Optimization="0"
+				AdditionalIncludeDirectories="../..;../../engines"
+				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
+				MinimalRebuild="true"
+				ExceptionHandling="1"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="true"
+				EnableFunctionLevelLinking="true"
+				ForceConformanceInForLoopScope="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="4"
+				WarnAsError="true"
+				SuppressStartupBanner="false"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)/cine.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="cine_Release"
+			IntermediateDirectory="cine_Release"
+			ConfigurationType="4"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				OmitFramePointers="true"
+				AdditionalIncludeDirectories="../..;../../engines"
+				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
+				StringPooling="true"
+				ExceptionHandling="1"
+				RuntimeLibrary="0"
+				BufferSecurityCheck="false"
+				EnableFunctionLevelLinking="false"
+				ForceConformanceInForLoopScope="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="4"
+				WarnAsError="true"
+				DebugInformationFormat="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)/cine.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<File
+			RelativePath="..\..\engines\cine\anim.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\anim.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\auto00.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\auto00.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\bg.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\bg.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\bg_list.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\bg_list.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\cine.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\cine.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\flip_support.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\flip_support.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\font.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\font.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\gfx.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\gfx.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\main_loop.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\main_loop.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\msg.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\msg.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\object.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\object.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\pal.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\pal.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\part.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\part.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\prc.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\prc.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\rel.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\rel.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\resource.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\resource.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\script.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\script.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\sfx_player.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\sfx_player.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\sound_driver.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\sound_driver.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\texte.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\texte.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\unpack.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\unpack.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\various.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\cine\various.h"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/dists/msvc8/gob.vcproj b/dists/msvc8/gob.vcproj
index 932a772ec8..f2c29bcbf3 100644
--- a/dists/msvc8/gob.vcproj
+++ b/dists/msvc8/gob.vcproj
@@ -271,6 +271,14 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\engines\gob\mult_v1.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\gob\mult_v2.cpp"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\gob\music.cpp"
 			>
 		</File>
diff --git a/dists/msvc8/scumm.vcproj b/dists/msvc8/scumm.vcproj
index 013f26f273..1b5f7542a3 100644
--- a/dists/msvc8/scumm.vcproj
+++ b/dists/msvc8/scumm.vcproj
@@ -387,6 +387,34 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="imuse"
+			>
+			<File
+				RelativePath="..\..\engines\scumm\imuse\imuse.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\engines\scumm\imuse\imuse.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\engines\scumm\imuse\imuse_internal.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\engines\scumm\imuse\imuse_player.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\engines\scumm\imuse\instrument.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\engines\scumm\imuse\instrument.h"
+				>
+			</File>
+		</Filter>
 		<File
 			RelativePath="..\..\engines\scumm\actor.cpp"
 			>
@@ -484,34 +512,10 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\imuse.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\imuse.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\imuse_internal.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\imuse_player.cpp"
-			>
-		</File>
-		<File
 			RelativePath="..\..\engines\scumm\input.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\scumm\instrument.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\scumm\instrument.h"
-			>
-		</File>
-		<File
 			RelativePath="..\..\engines\scumm\intern.h"
 			>
 		</File>
diff --git a/dists/msvc8/scummvm.sln b/dists/msvc8/scummvm.sln
index 91dd35847c..796083a0c2 100644
--- a/dists/msvc8/scummvm.sln
+++ b/dists/msvc8/scummvm.sln
@@ -5,13 +5,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scummvm", "scummvm.vcproj",
 		{6CC3E421-779D-4E80-8100-520886A0F9FF} = {6CC3E421-779D-4E80-8100-520886A0F9FF}
 		{1A1CA028-61B5-4A6C-A918-F5D8721AB1AC} = {1A1CA028-61B5-4A6C-A918-F5D8721AB1AC}
 		{C8AAE83E-198B-4ECA-A877-166827953979} = {C8AAE83E-198B-4ECA-A877-166827953979}
+		{B6AFD548-63D2-40CD-A652-E87095AFCBAF} = {B6AFD548-63D2-40CD-A652-E87095AFCBAF}
+		{B5527758-2F51-4CCD-AAE1-B0E28654BD6A} = {B5527758-2F51-4CCD-AAE1-B0E28654BD6A}
+		{6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7} = {6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7}
+		{E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA} = {E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}
 		{976D947A-A45F-4437-991E-412F695C64C7} = {976D947A-A45F-4437-991E-412F695C64C7}
-		{676DB4C5-9A3E-4EE1-8483-EBB79DC0700E} = {676DB4C5-9A3E-4EE1-8483-EBB79DC0700E}
 		{9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC} = {9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC}
-		{E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA} = {E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}
-		{6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7} = {6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7}
-		{B5527758-2F51-4CCD-AAE1-B0E28654BD6A} = {B5527758-2F51-4CCD-AAE1-B0E28654BD6A}
-		{B6AFD548-63D2-40CD-A652-E87095AFCBAF} = {B6AFD548-63D2-40CD-A652-E87095AFCBAF}
+		{676DB4C5-9A3E-4EE1-8483-EBB79DC0700E} = {676DB4C5-9A3E-4EE1-8483-EBB79DC0700E}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sword2", "sword2.vcproj", "{6CC3E421-779D-4E80-8100-520886A0F9FF}"
@@ -34,6 +34,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gob", "gob.vcproj", "{976D9
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lure", "lure.vcproj", "{1A1CA028-61B5-4A6C-A918-F5D8721AB1AC}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cine", "cine.vcproj", "{1CA4AC50-5426-433A-8B5E-FFE39568098E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -84,6 +86,10 @@ Global
 		{1A1CA028-61B5-4A6C-A918-F5D8721AB1AC}.Debug|Win32.Build.0 = Debug|Win32
 		{1A1CA028-61B5-4A6C-A918-F5D8721AB1AC}.Release|Win32.ActiveCfg = Release|Win32
 		{1A1CA028-61B5-4A6C-A918-F5D8721AB1AC}.Release|Win32.Build.0 = Release|Win32
+		{1CA4AC50-5426-433A-8B5E-FFE39568098E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{1CA4AC50-5426-433A-8B5E-FFE39568098E}.Debug|Win32.Build.0 = Debug|Win32
+		{1CA4AC50-5426-433A-8B5E-FFE39568098E}.Release|Win32.ActiveCfg = Release|Win32
+		{1CA4AC50-5426-433A-8B5E-FFE39568098E}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/dists/msvc8/scummvm.vcproj b/dists/msvc8/scummvm.vcproj
index 0d245e8b21..eea7f6327b 100644
--- a/dists/msvc8/scummvm.vcproj
+++ b/dists/msvc8/scummvm.vcproj
@@ -67,7 +67,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib sdl.lib zdll.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib sword1_debug/sword1.lib sword2_debug/sword2.lib lure_debug/lure.lib kyra_debug/kyra.lib gob_debug/gob.lib queen_debug/queen.lib saga_debug/saga.lib scumm_debug/scumm.lib simon_debug/simon.lib sky_debug/sky.lib"
+				AdditionalDependencies="winmm.lib sdl.lib zdll.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib sword1_debug/sword1.lib sword2_debug/sword2.lib lure_debug/lure.lib cine_debug/cine.lib kyra_debug/kyra.lib gob_debug/gob.lib queen_debug/queen.lib saga_debug/saga.lib scumm_debug/scumm.lib simon_debug/simon.lib sky_debug/sky.lib"
 				OutputFile="$(OutDir)/scummvm.exe"
 				LinkIncremental="2"
 				IgnoreDefaultLibraryNames="libc.lib"
@@ -155,7 +155,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib sdl.lib zdll.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib saga_release/saga.lib sword1_release/sword1.lib sword2_release/sword2.lib lure_release/lure.lib kyra_release/kyra.lib gob_release/gob.lib queen_release/queen.lib scumm_release/scumm.lib simon_release/simon.lib sky_release/sky.lib"
+				AdditionalDependencies="winmm.lib sdl.lib zdll.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib saga_release/saga.lib sword1_release/sword1.lib sword2_release/sword2.lib lure_release/lure.lib cine_release/cine.lib kyra_release/kyra.lib gob_release/gob.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"
@@ -311,14 +311,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\common\scaler.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\common\scaler.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\common\scummsys.h"
 				>
 			</File>
@@ -382,110 +374,6 @@
 				RelativePath="..\..\common\util.h"
 				>
 			</File>
-			<Filter
-				Name="scaler"
-				>
-				<File
-					RelativePath="..\..\common\scaler\2xsai.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\common\scaler\aspect.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\common\scaler\hq2x.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\common\scaler\hq2x.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\common\scaler\hq2x_i386.asm"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-							CommandLine="nasm.exe -O1 -f win32 -g -o $(OutDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
-							Outputs="$(OutDir)\$(InputName).obj"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-							CommandLine="nasm.exe -O1 -f win32 -o $(OutDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
-							Outputs="$(OutDir)\$(InputName).obj"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\common\scaler\hq3x.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\common\scaler\hq3x.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\common\scaler\hq3x_i386.asm"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-							CommandLine="nasm.exe -O1 -f win32 -g -o $(OutDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
-							Outputs="$(OutDir)\$(InputName).obj"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-							CommandLine="nasm.exe -O1 -f win32 -o $(OutDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
-							Outputs="$(OutDir)\$(InputName).obj"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\common\scaler\intern.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\common\scaler\scale2x.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\common\scaler\scale2x.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\common\scaler\scale3x.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\common\scaler\scale3x.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\common\scaler\scalebit.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\common\scaler\scalebit.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\common\scaler\thumbnail.cpp"
-					>
-				</File>
-			</Filter>
 		</Filter>
 		<Filter
 			Name="sound"
@@ -1034,10 +922,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\graphics\consolefont.cpp"
-				>
-			</File>
-			<File
 				RelativePath="..\..\graphics\font.cpp"
 				>
 			</File>
@@ -1078,23 +962,19 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\graphics\newfont.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\graphics\newfont_big.cpp"
+				RelativePath="..\..\graphics\primitives.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\graphics\primitives.cpp"
+				RelativePath="..\..\graphics\primitives.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\graphics\primitives.h"
+				RelativePath="..\..\graphics\scaler.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\graphics\scummfont.cpp"
+				RelativePath="..\..\graphics\scaler.h"
 				>
 			</File>
 			<File
@@ -1105,6 +985,130 @@
 				RelativePath="..\..\graphics\surface.h"
 				>
 			</File>
+			<Filter
+				Name="scaler"
+				>
+				<File
+					RelativePath="..\..\graphics\scaler\2xsai.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\graphics\scaler\aspect.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\graphics\scaler\hq2x.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\graphics\scaler\hq2x.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\graphics\scaler\hq2x_i386.asm"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+							CommandLine="nasm.exe -O1 -f win32 -g -o $(OutDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+							Outputs="$(OutDir)\$(InputName).obj"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+							CommandLine="nasm.exe -O1 -f win32 -o $(OutDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+							Outputs="$(OutDir)\$(InputName).obj"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\graphics\scaler\hq3x.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\graphics\scaler\hq3x.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\graphics\scaler\hq3x_i386.asm"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+							CommandLine="nasm.exe -O1 -f win32 -g -o $(OutDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+							Outputs="$(OutDir)\$(InputName).obj"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+							CommandLine="nasm.exe -O1 -f win32 -o $(OutDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+							Outputs="$(OutDir)\$(InputName).obj"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\graphics\scaler\intern.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\graphics\scaler\scale2x.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\graphics\scaler\scale2x.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\graphics\scaler\scale3x.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\graphics\scaler\scale3x.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\graphics\scaler\scalebit.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\graphics\scaler\scalebit.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\graphics\scaler\thumbnail.cpp"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="fonts"
+				>
+				<File
+					RelativePath="..\..\graphics\fonts\consolefont.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\graphics\fonts\newfont.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\graphics\fonts\newfont_big.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\graphics\fonts\scummfont.cpp"
+					>
+				</File>
+			</Filter>
 		</Filter>
 	</Files>
 	<Globals>
diff --git a/dists/msvc8/sword2.vcproj b/dists/msvc8/sword2.vcproj
index 96ca7c7dc1..f91633e45b 100644
--- a/dists/msvc8/sword2.vcproj
+++ b/dists/msvc8/sword2.vcproj
@@ -219,10 +219,6 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\sword2\icons.h"
-			>
-		</File>
-		<File
 			RelativePath="..\..\engines\sword2\interpreter.cpp"
 			>
 		</File>