VS: Disabled libpng, libtheora and opengl in the VS solution files

9 files changed, 25 insertions, 24 deletions

diff --git a/dists/msvc10/ScummVM_Global.props b/dists/msvc10/ScummVM_Global.props
index cb9ca4e7ad..c9028e3cda 100644
--- a/dists/msvc10/ScummVM_Global.props
+++ b/dists/msvc10/ScummVM_Global.props
@@ -14,7 +14,7 @@
 			<DisableLanguageExtensions>true</DisableLanguageExtensions>
 			<DisableSpecificWarnings>4068;4100;4103;4127;4244;4250;4310;4351;4512;4702;4706;4800;4996;6204;6211;6385;6386;;%(DisableSpecificWarnings)</DisableSpecificWarnings>
 			<AdditionalIncludeDirectories>$(SCUMMVM_LIBS)\include;..\..;..\..\engines;$(TargetDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-			<PreprocessorDefinitions>USE_ZLIB;USE_MAD;USE_VORBIS;USE_FLAC;USE_PNG;USE_THEORADEC;USE_SCALERS;USE_HQ_SCALERS;USE_RGB_COLOR;USE_MT32EMU;USE_NASM;USE_OPENGL;USE_INDEO3;USE_TRANSLATION;USE_DETECTLANG;ENABLE_SCUMM;ENABLE_SCUMM_7_8;ENABLE_HE;ENABLE_AGI;ENABLE_AGOS;ENABLE_AGOS2;ENABLE_CINE;ENABLE_CRUISE;ENABLE_DRACI;ENABLE_DRASCULA;ENABLE_GOB;ENABLE_GROOVIE;ENABLE_HUGO;ENABLE_KYRA;ENABLE_LURE;ENABLE_MADE;ENABLE_MOHAWK;ENABLE_PARALLACTION;ENABLE_QUEEN;ENABLE_SAGA;ENABLE_IHNM;ENABLE_SCI;ENABLE_SKY;ENABLE_SWORD1;ENABLE_SWORD2;ENABLE_TEENAGENT;ENABLE_TINSEL;ENABLE_TOON;ENABLE_TOUCHE;ENABLE_TUCKER;WIN32;SDL_BACKEND;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions>USE_ZLIB;USE_MAD;USE_VORBIS;USE_FLAC;USE_SCALERS;USE_HQ_SCALERS;USE_RGB_COLOR;USE_MT32EMU;USE_NASM;USE_INDEO3;USE_TRANSLATION;USE_DETECTLANG;ENABLE_SCUMM;ENABLE_SCUMM_7_8;ENABLE_HE;ENABLE_AGI;ENABLE_AGOS;ENABLE_AGOS2;ENABLE_CINE;ENABLE_CRUISE;ENABLE_DRACI;ENABLE_DRASCULA;ENABLE_GOB;ENABLE_GROOVIE;ENABLE_HUGO;ENABLE_KYRA;ENABLE_LURE;ENABLE_MADE;ENABLE_MOHAWK;ENABLE_PARALLACTION;ENABLE_QUEEN;ENABLE_SAGA;ENABLE_IHNM;ENABLE_SCI;ENABLE_SKY;ENABLE_SWORD1;ENABLE_SWORD2;ENABLE_TEENAGENT;ENABLE_TINSEL;ENABLE_TOON;ENABLE_TOUCHE;ENABLE_TUCKER;WIN32;SDL_BACKEND;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<ExceptionHandling></ExceptionHandling>
 			<RuntimeTypeInfo>false</RuntimeTypeInfo>
 			<WarningLevel>Level4</WarningLevel>
diff --git a/dists/msvc10/ScummVM_Global64.props b/dists/msvc10/ScummVM_Global64.props
index 62d85beb30..f554fc94d3 100644
--- a/dists/msvc10/ScummVM_Global64.props
+++ b/dists/msvc10/ScummVM_Global64.props
@@ -14,7 +14,7 @@
 			<DisableLanguageExtensions>true</DisableLanguageExtensions>
 			<DisableSpecificWarnings>4068;4100;4103;4127;4244;4250;4310;4351;4512;4702;4706;4800;4996;6204;6211;6385;6386;;%(DisableSpecificWarnings)</DisableSpecificWarnings>
 			<AdditionalIncludeDirectories>$(SCUMMVM_LIBS)\include;..\..;..\..\engines;$(TargetDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-			<PreprocessorDefinitions>USE_ZLIB;USE_MAD;USE_VORBIS;USE_FLAC;USE_PNG;USE_THEORADEC;USE_SCALERS;USE_HQ_SCALERS;USE_RGB_COLOR;USE_MT32EMU;USE_OPENGL;USE_INDEO3;USE_TRANSLATION;USE_DETECTLANG;ENABLE_SCUMM;ENABLE_SCUMM_7_8;ENABLE_HE;ENABLE_AGI;ENABLE_AGOS;ENABLE_AGOS2;ENABLE_CINE;ENABLE_CRUISE;ENABLE_DRACI;ENABLE_DRASCULA;ENABLE_GOB;ENABLE_GROOVIE;ENABLE_HUGO;ENABLE_KYRA;ENABLE_LURE;ENABLE_MADE;ENABLE_MOHAWK;ENABLE_PARALLACTION;ENABLE_QUEEN;ENABLE_SAGA;ENABLE_IHNM;ENABLE_SCI;ENABLE_SKY;ENABLE_SWORD1;ENABLE_SWORD2;ENABLE_TEENAGENT;ENABLE_TINSEL;ENABLE_TOON;ENABLE_TOUCHE;ENABLE_TUCKER;WIN32;SDL_BACKEND;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<PreprocessorDefinitions>USE_ZLIB;USE_MAD;USE_VORBIS;USE_FLAC;USE_SCALERS;USE_HQ_SCALERS;USE_RGB_COLOR;USE_MT32EMU;USE_INDEO3;USE_TRANSLATION;USE_DETECTLANG;ENABLE_SCUMM;ENABLE_SCUMM_7_8;ENABLE_HE;ENABLE_AGI;ENABLE_AGOS;ENABLE_AGOS2;ENABLE_CINE;ENABLE_CRUISE;ENABLE_DRACI;ENABLE_DRASCULA;ENABLE_GOB;ENABLE_GROOVIE;ENABLE_HUGO;ENABLE_KYRA;ENABLE_LURE;ENABLE_MADE;ENABLE_MOHAWK;ENABLE_PARALLACTION;ENABLE_QUEEN;ENABLE_SAGA;ENABLE_IHNM;ENABLE_SCI;ENABLE_SKY;ENABLE_SWORD1;ENABLE_SWORD2;ENABLE_TEENAGENT;ENABLE_TINSEL;ENABLE_TOON;ENABLE_TOUCHE;ENABLE_TUCKER;WIN32;SDL_BACKEND;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<ExceptionHandling></ExceptionHandling>
 			<RuntimeTypeInfo>false</RuntimeTypeInfo>
 			<WarningLevel>Level4</WarningLevel>
diff --git a/dists/msvc10/scummvm.vcxproj b/dists/msvc10/scummvm.vcxproj
index 0d59e6b832..d5190cb3ae 100644
--- a/dists/msvc10/scummvm.vcxproj
+++ b/dists/msvc10/scummvm.vcxproj
@@ -84,7 +84,7 @@
 		</ClCompile>
 		<Link>
 			<OutputFile>$(OutDir)scummvm.exe</OutputFile>
-			<AdditionalDependencies>zlib.lib;libmad.lib;libvorbisfile_static.lib;libvorbis_static.lib;libogg_static.lib;libFLAC_static.lib;libpng.lib;libtheora_static.lib;opengl32.lib;sdl.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+			<AdditionalDependencies>zlib.lib;libmad.lib;libvorbisfile_static.lib;libvorbis_static.lib;libogg_static.lib;libFLAC_static.lib;sdl.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
 		</Link>
 	</ItemDefinitionGroup>
 	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Analysis|Win32'">
@@ -93,7 +93,7 @@
 		</ClCompile>
 		<Link>
 			<OutputFile>$(OutDir)scummvm.exe</OutputFile>
-			<AdditionalDependencies>zlib.lib;libmad.lib;libvorbisfile_static.lib;libvorbis_static.lib;libogg_static.lib;libFLAC_static.lib;libpng.lib;libtheora_static.lib;opengl32.lib;sdl.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+			<AdditionalDependencies>zlib.lib;libmad.lib;libvorbisfile_static.lib;libvorbis_static.lib;libogg_static.lib;libFLAC_static.lib;sdl.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
 		</Link>
 	</ItemDefinitionGroup>
 	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -102,7 +102,7 @@
 		</ClCompile>
 		<Link>
 			<OutputFile>$(OutDir)scummvm.exe</OutputFile>
-			<AdditionalDependencies>zlib.lib;libmad.lib;libvorbisfile_static.lib;libvorbis_static.lib;libogg_static.lib;libFLAC_static.lib;libpng.lib;libtheora_static.lib;opengl32.lib;sdl.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+			<AdditionalDependencies>zlib.lib;libmad.lib;libvorbisfile_static.lib;libvorbis_static.lib;libogg_static.lib;libFLAC_static.lib;sdl.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
 		</Link>
 	</ItemDefinitionGroup>
 	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -111,7 +111,7 @@
 		</ClCompile>
 		<Link>
 			<OutputFile>$(OutDir)scummvm.exe</OutputFile>
-			<AdditionalDependencies>zlib.lib;libmad.lib;libvorbisfile_static.lib;libvorbis_static.lib;libogg_static.lib;libFLAC_static.lib;libpng.lib;libtheora_static.lib;opengl32.lib;sdl.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+			<AdditionalDependencies>zlib.lib;libmad.lib;libvorbisfile_static.lib;libvorbis_static.lib;libogg_static.lib;libFLAC_static.lib;sdl.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
 		</Link>
 	</ItemDefinitionGroup>
 	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Analysis|x64'">
@@ -120,7 +120,7 @@
 		</ClCompile>
 		<Link>
 			<OutputFile>$(OutDir)scummvm.exe</OutputFile>
-			<AdditionalDependencies>zlib.lib;libmad.lib;libvorbisfile_static.lib;libvorbis_static.lib;libogg_static.lib;libFLAC_static.lib;libpng.lib;libtheora_static.lib;opengl32.lib;sdl.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+			<AdditionalDependencies>zlib.lib;libmad.lib;libvorbisfile_static.lib;libvorbis_static.lib;libogg_static.lib;libFLAC_static.lib;sdl.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
 		</Link>
 	</ItemDefinitionGroup>
 	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -129,7 +129,7 @@
 		</ClCompile>
 		<Link>
 			<OutputFile>$(OutDir)scummvm.exe</OutputFile>
-			<AdditionalDependencies>zlib.lib;libmad.lib;libvorbisfile_static.lib;libvorbis_static.lib;libogg_static.lib;libFLAC_static.lib;libpng.lib;libtheora_static.lib;opengl32.lib;sdl.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+			<AdditionalDependencies>zlib.lib;libmad.lib;libvorbisfile_static.lib;libvorbis_static.lib;libogg_static.lib;libFLAC_static.lib;sdl.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
 		</Link>
 	</ItemDefinitionGroup>
 	<ItemGroup>
@@ -487,6 +487,7 @@
 		<ClInclude Include="..\..\backends\graphics\opengl\opengl-graphics.h" />
 		<ClInclude Include="..\..\backends\graphics\openglsdl\openglsdl-graphics.h" />
 		<ClInclude Include="..\..\backends\graphics\openpandora\op-graphics.h" />
+		<ClInclude Include="..\..\backends\graphics\samsungtvsdl\samsungtvsdl-graphics.h" />
 		<ClInclude Include="..\..\backends\graphics\sdl\sdl-graphics.h" />
 		<ClInclude Include="..\..\backends\graphics\symbiansdl\symbiansdl-graphics.h" />
 		<ClInclude Include="..\..\backends\graphics\wincesdl\wincesdl-graphics.h" />
diff --git a/dists/msvc8/ScummVM_Global.vsprops b/dists/msvc8/ScummVM_Global.vsprops
index ef9d02b3e5..7343b3fcee 100644
--- a/dists/msvc8/ScummVM_Global.vsprops
+++ b/dists/msvc8/ScummVM_Global.vsprops
@@ -11,7 +11,7 @@
 		DisableLanguageExtensions="true"
 		DisableSpecificWarnings="4068;4100;4103;4127;4244;4250;4310;4351;4512;4702;4706;4800;4996;6204;6211;6385;6386;"
 		AdditionalIncludeDirectories="..\..;..\..\engines;$(SCUMMVM_LIBS)\include;$(TargetDir)"
-		PreprocessorDefinitions="USE_ZLIB;USE_MAD;USE_VORBIS;USE_FLAC;USE_PNG;USE_THEORADEC;USE_SCALERS;USE_HQ_SCALERS;USE_RGB_COLOR;USE_MT32EMU;USE_NASM;USE_OPENGL;USE_INDEO3;USE_TRANSLATION;USE_DETECTLANG;ENABLE_SCUMM;ENABLE_SCUMM_7_8;ENABLE_HE;ENABLE_AGI;ENABLE_AGOS;ENABLE_AGOS2;ENABLE_CINE;ENABLE_CRUISE;ENABLE_DRACI;ENABLE_DRASCULA;ENABLE_GOB;ENABLE_GROOVIE;ENABLE_HUGO;ENABLE_KYRA;ENABLE_LURE;ENABLE_MADE;ENABLE_MOHAWK;ENABLE_PARALLACTION;ENABLE_QUEEN;ENABLE_SAGA;ENABLE_IHNM;ENABLE_SCI;ENABLE_SKY;ENABLE_SWORD1;ENABLE_SWORD2;ENABLE_TEENAGENT;ENABLE_TINSEL;ENABLE_TOON;ENABLE_TOUCHE;ENABLE_TUCKER;WIN32;SDL_BACKEND"
+		PreprocessorDefinitions="USE_ZLIB;USE_MAD;USE_VORBIS;USE_FLAC;USE_SCALERS;USE_HQ_SCALERS;USE_RGB_COLOR;USE_MT32EMU;USE_NASM;USE_INDEO3;USE_TRANSLATION;USE_DETECTLANG;ENABLE_SCUMM;ENABLE_SCUMM_7_8;ENABLE_HE;ENABLE_AGI;ENABLE_AGOS;ENABLE_AGOS2;ENABLE_CINE;ENABLE_CRUISE;ENABLE_DRACI;ENABLE_DRASCULA;ENABLE_GOB;ENABLE_GROOVIE;ENABLE_HUGO;ENABLE_KYRA;ENABLE_LURE;ENABLE_MADE;ENABLE_MOHAWK;ENABLE_PARALLACTION;ENABLE_QUEEN;ENABLE_SAGA;ENABLE_IHNM;ENABLE_SCI;ENABLE_SKY;ENABLE_SWORD1;ENABLE_SWORD2;ENABLE_TEENAGENT;ENABLE_TINSEL;ENABLE_TOON;ENABLE_TOUCHE;ENABLE_TUCKER;WIN32;SDL_BACKEND"
 		ExceptionHandling="0"
 		RuntimeTypeInfo="false"
 		RuntimeTypeInfo="false"
diff --git a/dists/msvc8/ScummVM_Global64.vsprops b/dists/msvc8/ScummVM_Global64.vsprops
index c0c8376e99..584534b37f 100644
--- a/dists/msvc8/ScummVM_Global64.vsprops
+++ b/dists/msvc8/ScummVM_Global64.vsprops
@@ -11,7 +11,7 @@
 		DisableLanguageExtensions="true"
 		DisableSpecificWarnings="4068;4100;4103;4127;4244;4250;4310;4351;4512;4702;4706;4800;4996;6204;6211;6385;6386;"
 		AdditionalIncludeDirectories="..\..;..\..\engines;$(SCUMMVM_LIBS)\include;$(TargetDir)"
-		PreprocessorDefinitions="USE_ZLIB;USE_MAD;USE_VORBIS;USE_FLAC;USE_PNG;USE_THEORADEC;USE_SCALERS;USE_HQ_SCALERS;USE_RGB_COLOR;USE_MT32EMU;USE_OPENGL;USE_INDEO3;USE_TRANSLATION;USE_DETECTLANG;ENABLE_SCUMM;ENABLE_SCUMM_7_8;ENABLE_HE;ENABLE_AGI;ENABLE_AGOS;ENABLE_AGOS2;ENABLE_CINE;ENABLE_CRUISE;ENABLE_DRACI;ENABLE_DRASCULA;ENABLE_GOB;ENABLE_GROOVIE;ENABLE_HUGO;ENABLE_KYRA;ENABLE_LURE;ENABLE_MADE;ENABLE_MOHAWK;ENABLE_PARALLACTION;ENABLE_QUEEN;ENABLE_SAGA;ENABLE_IHNM;ENABLE_SCI;ENABLE_SKY;ENABLE_SWORD1;ENABLE_SWORD2;ENABLE_TEENAGENT;ENABLE_TINSEL;ENABLE_TOON;ENABLE_TOUCHE;ENABLE_TUCKER;WIN32;SDL_BACKEND"
+		PreprocessorDefinitions="USE_ZLIB;USE_MAD;USE_VORBIS;USE_FLAC;USE_SCALERS;USE_HQ_SCALERS;USE_RGB_COLOR;USE_MT32EMU;USE_INDEO3;USE_TRANSLATION;USE_DETECTLANG;ENABLE_SCUMM;ENABLE_SCUMM_7_8;ENABLE_HE;ENABLE_AGI;ENABLE_AGOS;ENABLE_AGOS2;ENABLE_CINE;ENABLE_CRUISE;ENABLE_DRACI;ENABLE_DRASCULA;ENABLE_GOB;ENABLE_GROOVIE;ENABLE_HUGO;ENABLE_KYRA;ENABLE_LURE;ENABLE_MADE;ENABLE_MOHAWK;ENABLE_PARALLACTION;ENABLE_QUEEN;ENABLE_SAGA;ENABLE_IHNM;ENABLE_SCI;ENABLE_SKY;ENABLE_SWORD1;ENABLE_SWORD2;ENABLE_TEENAGENT;ENABLE_TINSEL;ENABLE_TOON;ENABLE_TOUCHE;ENABLE_TUCKER;WIN32;SDL_BACKEND"
 		ExceptionHandling="0"
 		RuntimeTypeInfo="false"
 		RuntimeTypeInfo="false"
diff --git a/dists/msvc8/scummvm.vcproj b/dists/msvc8/scummvm.vcproj
index c6ddf8a4bd..fa1dae0bd7 100644
--- a/dists/msvc8/scummvm.vcproj
+++ b/dists/msvc8/scummvm.vcproj
@@ -15,37 +15,37 @@
 		<Configuration Name="Debug|Win32" ConfigurationType="1" InheritedPropertySheets=".\ScummVM_Debug.vsprops">
 			<Tool	Name="VCCLCompilerTool" DisableLanguageExtensions="false" />
 			<Tool	Name="VCLinkerTool" OutputFile="$(OutDir)/scummvm"
-				AdditionalDependencies=" zlib.lib libmad.lib libvorbisfile_static.lib libvorbis_static.lib libogg_static.lib libFLAC_static.lib libpng.lib libtheora_static.lib opengl32.lib sdl.lib winmm.lib"
+				AdditionalDependencies=" zlib.lib libmad.lib libvorbisfile_static.lib libvorbis_static.lib libogg_static.lib libFLAC_static.lib sdl.lib winmm.lib"
 			/>
 		</Configuration>
 		<Configuration Name="Analysis|Win32" ConfigurationType="1" InheritedPropertySheets=".\ScummVM_Analysis.vsprops">
 			<Tool	Name="VCCLCompilerTool" DisableLanguageExtensions="false" />
 			<Tool	Name="VCLinkerTool" OutputFile="$(OutDir)/scummvm"
-				AdditionalDependencies=" zlib.lib libmad.lib libvorbisfile_static.lib libvorbis_static.lib libogg_static.lib libFLAC_static.lib libpng.lib libtheora_static.lib opengl32.lib sdl.lib winmm.lib"
+				AdditionalDependencies=" zlib.lib libmad.lib libvorbisfile_static.lib libvorbis_static.lib libogg_static.lib libFLAC_static.lib sdl.lib winmm.lib"
 			/>
 		</Configuration>
 		<Configuration Name="Release|Win32" ConfigurationType="1" InheritedPropertySheets=".\ScummVM_Release.vsprops">
 			<Tool	Name="VCCLCompilerTool" DisableLanguageExtensions="false" />
 			<Tool	Name="VCLinkerTool" OutputFile="$(OutDir)/scummvm"
-				AdditionalDependencies=" zlib.lib libmad.lib libvorbisfile_static.lib libvorbis_static.lib libogg_static.lib libFLAC_static.lib libpng.lib libtheora_static.lib opengl32.lib sdl.lib winmm.lib"
+				AdditionalDependencies=" zlib.lib libmad.lib libvorbisfile_static.lib libvorbis_static.lib libogg_static.lib libFLAC_static.lib sdl.lib winmm.lib"
 			/>
 		</Configuration>
 		<Configuration Name="Debug|x64" ConfigurationType="1" InheritedPropertySheets=".\ScummVM_Debug64.vsprops">
 			<Tool	Name="VCCLCompilerTool" DisableLanguageExtensions="false" />
 			<Tool	Name="VCLinkerTool" OutputFile="$(OutDir)/scummvm"
-				AdditionalDependencies=" zlib.lib libmad.lib libvorbisfile_static.lib libvorbis_static.lib libogg_static.lib libFLAC_static.lib libpng.lib libtheora_static.lib opengl32.lib sdl.lib winmm.lib"
+				AdditionalDependencies=" zlib.lib libmad.lib libvorbisfile_static.lib libvorbis_static.lib libogg_static.lib libFLAC_static.lib sdl.lib winmm.lib"
 			/>
 		</Configuration>
 		<Configuration Name="Analysis|x64" ConfigurationType="1" InheritedPropertySheets=".\ScummVM_Analysis64.vsprops">
 			<Tool	Name="VCCLCompilerTool" DisableLanguageExtensions="false" />
 			<Tool	Name="VCLinkerTool" OutputFile="$(OutDir)/scummvm"
-				AdditionalDependencies=" zlib.lib libmad.lib libvorbisfile_static.lib libvorbis_static.lib libogg_static.lib libFLAC_static.lib libpng.lib libtheora_static.lib opengl32.lib sdl.lib winmm.lib"
+				AdditionalDependencies=" zlib.lib libmad.lib libvorbisfile_static.lib libvorbis_static.lib libogg_static.lib libFLAC_static.lib sdl.lib winmm.lib"
 			/>
 		</Configuration>
 		<Configuration Name="Release|x64" ConfigurationType="1" InheritedPropertySheets=".\ScummVM_Release64.vsprops">
 			<Tool	Name="VCCLCompilerTool" DisableLanguageExtensions="false" />
 			<Tool	Name="VCLinkerTool" OutputFile="$(OutDir)/scummvm"
-				AdditionalDependencies=" zlib.lib libmad.lib libvorbisfile_static.lib libvorbis_static.lib libogg_static.lib libFLAC_static.lib libpng.lib libtheora_static.lib opengl32.lib sdl.lib winmm.lib"
+				AdditionalDependencies=" zlib.lib libmad.lib libvorbisfile_static.lib libvorbis_static.lib libogg_static.lib libFLAC_static.lib sdl.lib winmm.lib"
 			/>
 		</Configuration>
 	</Configurations>
diff --git a/dists/msvc9/ScummVM_Global.vsprops b/dists/msvc9/ScummVM_Global.vsprops
index ef9d02b3e5..7343b3fcee 100644
--- a/dists/msvc9/ScummVM_Global.vsprops
+++ b/dists/msvc9/ScummVM_Global.vsprops
@@ -11,7 +11,7 @@
 		DisableLanguageExtensions="true"
 		DisableSpecificWarnings="4068;4100;4103;4127;4244;4250;4310;4351;4512;4702;4706;4800;4996;6204;6211;6385;6386;"
 		AdditionalIncludeDirectories="..\..;..\..\engines;$(SCUMMVM_LIBS)\include;$(TargetDir)"
-		PreprocessorDefinitions="USE_ZLIB;USE_MAD;USE_VORBIS;USE_FLAC;USE_PNG;USE_THEORADEC;USE_SCALERS;USE_HQ_SCALERS;USE_RGB_COLOR;USE_MT32EMU;USE_NASM;USE_OPENGL;USE_INDEO3;USE_TRANSLATION;USE_DETECTLANG;ENABLE_SCUMM;ENABLE_SCUMM_7_8;ENABLE_HE;ENABLE_AGI;ENABLE_AGOS;ENABLE_AGOS2;ENABLE_CINE;ENABLE_CRUISE;ENABLE_DRACI;ENABLE_DRASCULA;ENABLE_GOB;ENABLE_GROOVIE;ENABLE_HUGO;ENABLE_KYRA;ENABLE_LURE;ENABLE_MADE;ENABLE_MOHAWK;ENABLE_PARALLACTION;ENABLE_QUEEN;ENABLE_SAGA;ENABLE_IHNM;ENABLE_SCI;ENABLE_SKY;ENABLE_SWORD1;ENABLE_SWORD2;ENABLE_TEENAGENT;ENABLE_TINSEL;ENABLE_TOON;ENABLE_TOUCHE;ENABLE_TUCKER;WIN32;SDL_BACKEND"
+		PreprocessorDefinitions="USE_ZLIB;USE_MAD;USE_VORBIS;USE_FLAC;USE_SCALERS;USE_HQ_SCALERS;USE_RGB_COLOR;USE_MT32EMU;USE_NASM;USE_INDEO3;USE_TRANSLATION;USE_DETECTLANG;ENABLE_SCUMM;ENABLE_SCUMM_7_8;ENABLE_HE;ENABLE_AGI;ENABLE_AGOS;ENABLE_AGOS2;ENABLE_CINE;ENABLE_CRUISE;ENABLE_DRACI;ENABLE_DRASCULA;ENABLE_GOB;ENABLE_GROOVIE;ENABLE_HUGO;ENABLE_KYRA;ENABLE_LURE;ENABLE_MADE;ENABLE_MOHAWK;ENABLE_PARALLACTION;ENABLE_QUEEN;ENABLE_SAGA;ENABLE_IHNM;ENABLE_SCI;ENABLE_SKY;ENABLE_SWORD1;ENABLE_SWORD2;ENABLE_TEENAGENT;ENABLE_TINSEL;ENABLE_TOON;ENABLE_TOUCHE;ENABLE_TUCKER;WIN32;SDL_BACKEND"
 		ExceptionHandling="0"
 		RuntimeTypeInfo="false"
 		RuntimeTypeInfo="false"
diff --git a/dists/msvc9/ScummVM_Global64.vsprops b/dists/msvc9/ScummVM_Global64.vsprops
index c0c8376e99..584534b37f 100644
--- a/dists/msvc9/ScummVM_Global64.vsprops
+++ b/dists/msvc9/ScummVM_Global64.vsprops
@@ -11,7 +11,7 @@
 		DisableLanguageExtensions="true"
 		DisableSpecificWarnings="4068;4100;4103;4127;4244;4250;4310;4351;4512;4702;4706;4800;4996;6204;6211;6385;6386;"
 		AdditionalIncludeDirectories="..\..;..\..\engines;$(SCUMMVM_LIBS)\include;$(TargetDir)"
-		PreprocessorDefinitions="USE_ZLIB;USE_MAD;USE_VORBIS;USE_FLAC;USE_PNG;USE_THEORADEC;USE_SCALERS;USE_HQ_SCALERS;USE_RGB_COLOR;USE_MT32EMU;USE_OPENGL;USE_INDEO3;USE_TRANSLATION;USE_DETECTLANG;ENABLE_SCUMM;ENABLE_SCUMM_7_8;ENABLE_HE;ENABLE_AGI;ENABLE_AGOS;ENABLE_AGOS2;ENABLE_CINE;ENABLE_CRUISE;ENABLE_DRACI;ENABLE_DRASCULA;ENABLE_GOB;ENABLE_GROOVIE;ENABLE_HUGO;ENABLE_KYRA;ENABLE_LURE;ENABLE_MADE;ENABLE_MOHAWK;ENABLE_PARALLACTION;ENABLE_QUEEN;ENABLE_SAGA;ENABLE_IHNM;ENABLE_SCI;ENABLE_SKY;ENABLE_SWORD1;ENABLE_SWORD2;ENABLE_TEENAGENT;ENABLE_TINSEL;ENABLE_TOON;ENABLE_TOUCHE;ENABLE_TUCKER;WIN32;SDL_BACKEND"
+		PreprocessorDefinitions="USE_ZLIB;USE_MAD;USE_VORBIS;USE_FLAC;USE_SCALERS;USE_HQ_SCALERS;USE_RGB_COLOR;USE_MT32EMU;USE_INDEO3;USE_TRANSLATION;USE_DETECTLANG;ENABLE_SCUMM;ENABLE_SCUMM_7_8;ENABLE_HE;ENABLE_AGI;ENABLE_AGOS;ENABLE_AGOS2;ENABLE_CINE;ENABLE_CRUISE;ENABLE_DRACI;ENABLE_DRASCULA;ENABLE_GOB;ENABLE_GROOVIE;ENABLE_HUGO;ENABLE_KYRA;ENABLE_LURE;ENABLE_MADE;ENABLE_MOHAWK;ENABLE_PARALLACTION;ENABLE_QUEEN;ENABLE_SAGA;ENABLE_IHNM;ENABLE_SCI;ENABLE_SKY;ENABLE_SWORD1;ENABLE_SWORD2;ENABLE_TEENAGENT;ENABLE_TINSEL;ENABLE_TOON;ENABLE_TOUCHE;ENABLE_TUCKER;WIN32;SDL_BACKEND"
 		ExceptionHandling="0"
 		RuntimeTypeInfo="false"
 		RuntimeTypeInfo="false"
diff --git a/dists/msvc9/scummvm.vcproj b/dists/msvc9/scummvm.vcproj
index d6d17384ef..ebabab423b 100644
--- a/dists/msvc9/scummvm.vcproj
+++ b/dists/msvc9/scummvm.vcproj
@@ -16,37 +16,37 @@
 		<Configuration Name="Debug|Win32" ConfigurationType="1" InheritedPropertySheets=".\ScummVM_Debug.vsprops">
 			<Tool	Name="VCCLCompilerTool" DisableLanguageExtensions="false" />
 			<Tool	Name="VCLinkerTool" OutputFile="$(OutDir)/scummvm"
-				AdditionalDependencies=" zlib.lib libmad.lib libvorbisfile_static.lib libvorbis_static.lib libogg_static.lib libFLAC_static.lib libpng.lib libtheora_static.lib opengl32.lib sdl.lib winmm.lib"
+				AdditionalDependencies=" zlib.lib libmad.lib libvorbisfile_static.lib libvorbis_static.lib libogg_static.lib libFLAC_static.lib sdl.lib winmm.lib"
 			/>
 		</Configuration>
 		<Configuration Name="Analysis|Win32" ConfigurationType="1" InheritedPropertySheets=".\ScummVM_Analysis.vsprops">
 			<Tool	Name="VCCLCompilerTool" DisableLanguageExtensions="false" />
 			<Tool	Name="VCLinkerTool" OutputFile="$(OutDir)/scummvm"
-				AdditionalDependencies=" zlib.lib libmad.lib libvorbisfile_static.lib libvorbis_static.lib libogg_static.lib libFLAC_static.lib libpng.lib libtheora_static.lib opengl32.lib sdl.lib winmm.lib"
+				AdditionalDependencies=" zlib.lib libmad.lib libvorbisfile_static.lib libvorbis_static.lib libogg_static.lib libFLAC_static.lib sdl.lib winmm.lib"
 			/>
 		</Configuration>
 		<Configuration Name="Release|Win32" ConfigurationType="1" InheritedPropertySheets=".\ScummVM_Release.vsprops">
 			<Tool	Name="VCCLCompilerTool" DisableLanguageExtensions="false" />
 			<Tool	Name="VCLinkerTool" OutputFile="$(OutDir)/scummvm"
-				AdditionalDependencies=" zlib.lib libmad.lib libvorbisfile_static.lib libvorbis_static.lib libogg_static.lib libFLAC_static.lib libpng.lib libtheora_static.lib opengl32.lib sdl.lib winmm.lib"
+				AdditionalDependencies=" zlib.lib libmad.lib libvorbisfile_static.lib libvorbis_static.lib libogg_static.lib libFLAC_static.lib sdl.lib winmm.lib"
 			/>
 		</Configuration>
 		<Configuration Name="Debug|x64" ConfigurationType="1" InheritedPropertySheets=".\ScummVM_Debug64.vsprops">
 			<Tool	Name="VCCLCompilerTool" DisableLanguageExtensions="false" />
 			<Tool	Name="VCLinkerTool" OutputFile="$(OutDir)/scummvm"
-				AdditionalDependencies=" zlib.lib libmad.lib libvorbisfile_static.lib libvorbis_static.lib libogg_static.lib libFLAC_static.lib libpng.lib libtheora_static.lib opengl32.lib sdl.lib winmm.lib"
+				AdditionalDependencies=" zlib.lib libmad.lib libvorbisfile_static.lib libvorbis_static.lib libogg_static.lib libFLAC_static.lib sdl.lib winmm.lib"
 			/>
 		</Configuration>
 		<Configuration Name="Analysis|x64" ConfigurationType="1" InheritedPropertySheets=".\ScummVM_Analysis64.vsprops">
 			<Tool	Name="VCCLCompilerTool" DisableLanguageExtensions="false" />
 			<Tool	Name="VCLinkerTool" OutputFile="$(OutDir)/scummvm"
-				AdditionalDependencies=" zlib.lib libmad.lib libvorbisfile_static.lib libvorbis_static.lib libogg_static.lib libFLAC_static.lib libpng.lib libtheora_static.lib opengl32.lib sdl.lib winmm.lib"
+				AdditionalDependencies=" zlib.lib libmad.lib libvorbisfile_static.lib libvorbis_static.lib libogg_static.lib libFLAC_static.lib sdl.lib winmm.lib"
 			/>
 		</Configuration>
 		<Configuration Name="Release|x64" ConfigurationType="1" InheritedPropertySheets=".\ScummVM_Release64.vsprops">
 			<Tool	Name="VCCLCompilerTool" DisableLanguageExtensions="false" />
 			<Tool	Name="VCLinkerTool" OutputFile="$(OutDir)/scummvm"
-				AdditionalDependencies=" zlib.lib libmad.lib libvorbisfile_static.lib libvorbis_static.lib libogg_static.lib libFLAC_static.lib libpng.lib libtheora_static.lib opengl32.lib sdl.lib winmm.lib"
+				AdditionalDependencies=" zlib.lib libmad.lib libvorbisfile_static.lib libvorbis_static.lib libogg_static.lib libFLAC_static.lib sdl.lib winmm.lib"
 			/>
 		</Configuration>
 	</Configurations>