really fix SOIL-related troubles, i think :p

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3183 8ced0084-cf51-0410-be5f-012b33b47a6e

4 files changed, 713 insertions, 711 deletions

diff --git a/Source/Core/VideoCommon/Src/HiresTextures.cpp b/Source/Core/VideoCommon/Src/HiresTextures.cpp
index d55bbccaad..16a19eb41e 100644
--- a/Source/Core/VideoCommon/Src/HiresTextures.cpp
+++ b/Source/Core/VideoCommon/Src/HiresTextures.cpp
@@ -23,6 +23,7 @@
 #include "CommonPaths.h"

 #include "FileUtil.h"

 #include "FileSearch.h"

+

 namespace HiresTextures

 {

 

diff --git a/Source/Core/VideoCommon/VideoCommon.vcproj b/Source/Core/VideoCommon/VideoCommon.vcproj
index 9f2830426d..eaa810a193 100644
--- a/Source/Core/VideoCommon/VideoCommon.vcproj
+++ b/Source/Core/VideoCommon/VideoCommon.vcproj
@@ -1,696 +1,695 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

-        ProjectType="Visual C++"

-        Version="9.00"

-        Name="VideoCommon"

-        ProjectGUID="{E5D1F0C0-AA07-4841-A4EB-4CF4DAA6B0FA}"

-        RootNamespace="VideoCommon"

-        Keyword="Win32Proj"

-        TargetFrameworkVersion="131072"

-        >

-        <Platforms>

-                <Platform

-                        Name="Win32"

-                />

-                <Platform

-                        Name="x64"

-                />

-        </Platforms>

-        <ToolFiles>

-        </ToolFiles>

-        <Configurations>

-                <Configuration

-                        Name="Debug|Win32"

-                        OutputDirectory="$(PlatformName)\$(ConfigurationName)"

-                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

-                        ConfigurationType="4"

-                        CharacterSet="1"

-                        >

-                        <Tool

-                                Name="VCPreBuildEventTool"

-                        />

-                        <Tool

-                                Name="VCCustomBuildTool"

-                        />

-                        <Tool

-                                Name="VCXMLDataGeneratorTool"

-                        />

-                        <Tool

-                                Name="VCWebServiceProxyGeneratorTool"

-                        />

-                        <Tool

-                                Name="VCMIDLTool"

-                        />

-                        <Tool

-                                Name="VCCLCompilerTool"

-                                Optimization="0"

-                                AdditionalIncludeDirectories="../../Core/Common/Src;../../PluginSpecs;../../../Externals/SOIL"

-                                PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"

-                                MinimalRebuild="true"

-                                BasicRuntimeChecks="3"

-                                RuntimeLibrary="1"

-                                BufferSecurityCheck="false"

-                                UsePrecompiledHeader="0"

-                                WarningLevel="3"

-                                DebugInformationFormat="4"

-                        />

-                        <Tool

-                                Name="VCManagedResourceCompilerTool"

-                        />

-                        <Tool

-                                Name="VCResourceCompilerTool"

-                        />

-                        <Tool

-                                Name="VCPreLinkEventTool"

-                        />

-                        <Tool

-                                Name="VCLibrarianTool"

-                        />

-                        <Tool

-                                Name="VCALinkTool"

-                        />

-                        <Tool

-                                Name="VCXDCMakeTool"

-                        />

-                        <Tool

-                                Name="VCBscMakeTool"

-                        />

-                        <Tool

-                                Name="VCFxCopTool"

-                        />

-                        <Tool

-                                Name="VCPostBuildEventTool"

-                        />

-                </Configuration>

-                <Configuration

-                        Name="Release|Win32"

-                        OutputDirectory="$(PlatformName)\$(ConfigurationName)"

-                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

-                        ConfigurationType="4"

-                        CharacterSet="1"

-                        WholeProgramOptimization="1"

-                        >

-                        <Tool

-                                Name="VCPreBuildEventTool"

-                        />

-                        <Tool

-                                Name="VCCustomBuildTool"

-                        />

-                        <Tool

-                                Name="VCXMLDataGeneratorTool"

-                        />

-                        <Tool

-                                Name="VCWebServiceProxyGeneratorTool"

-                        />

-                        <Tool

-                                Name="VCMIDLTool"

-                        />

-                        <Tool

-                                Name="VCCLCompilerTool"

-                                Optimization="2"

-                                EnableIntrinsicFunctions="true"

-                                AdditionalIncludeDirectories="../../Core/Common/Src;../../PluginSpecs;../../../Externals/SOIL"

-                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"

-                                StringPooling="true"

-                                RuntimeLibrary="0"

-                                BufferSecurityCheck="false"

-                                EnableEnhancedInstructionSet="2"

-                                FloatingPointModel="0"

-                                UsePrecompiledHeader="0"

-                                WarningLevel="3"

-                                DebugInformationFormat="3"

-                        />

-                        <Tool

-                                Name="VCManagedResourceCompilerTool"

-                        />

-                        <Tool

-                                Name="VCResourceCompilerTool"

-                        />

-                        <Tool

-                                Name="VCPreLinkEventTool"

-                        />

-                        <Tool

-                                Name="VCLibrarianTool"

-                        />

-                        <Tool

-                                Name="VCALinkTool"

-                        />

-                        <Tool

-                                Name="VCXDCMakeTool"

-                        />

-                        <Tool

-                                Name="VCBscMakeTool"

-                        />

-                        <Tool

-                                Name="VCFxCopTool"

-                        />

-                        <Tool

-                                Name="VCPostBuildEventTool"

-                        />

-                </Configuration>

-                <Configuration

-                        Name="DebugFast|Win32"

-                        OutputDirectory="$(PlatformName)\$(ConfigurationName)"

-                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

-                        ConfigurationType="4"

-                        CharacterSet="1"

-                        WholeProgramOptimization="1"

-                        >

-                        <Tool

-                                Name="VCPreBuildEventTool"

-                        />

-                        <Tool

-                                Name="VCCustomBuildTool"

-                        />

-                        <Tool

-                                Name="VCXMLDataGeneratorTool"

-                        />

-                        <Tool

-                                Name="VCWebServiceProxyGeneratorTool"

-                        />

-                        <Tool

-                                Name="VCMIDLTool"

-                        />

-                        <Tool

-                                Name="VCCLCompilerTool"

-                                AdditionalIncludeDirectories="../../Core/Common/Src;../../PluginSpecs;../../../Externals/SOIL"

-                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"

-                                RuntimeLibrary="0"

-                                BufferSecurityCheck="false"

-                                UsePrecompiledHeader="0"

-                                WarningLevel="3"

-                                DebugInformationFormat="3"

-                        />

-                        <Tool

-                                Name="VCManagedResourceCompilerTool"

-                        />

-                        <Tool

-                                Name="VCResourceCompilerTool"

-                        />

-                        <Tool

-                                Name="VCPreLinkEventTool"

-                        />

-                        <Tool

-                                Name="VCLibrarianTool"

-                        />

-                        <Tool

-                                Name="VCALinkTool"

-                        />

-                        <Tool

-                                Name="VCXDCMakeTool"

-                        />

-                        <Tool

-                                Name="VCBscMakeTool"

-                        />

-                        <Tool

-                                Name="VCFxCopTool"

-                        />

-                        <Tool

-                                Name="VCPostBuildEventTool"

-                        />

-                </Configuration>

-                <Configuration

-                        Name="Debug|x64"

-                        OutputDirectory="$(PlatformName)\$(ConfigurationName)"

-                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

-                        ConfigurationType="4"

-                        CharacterSet="1"

-                        >

-                        <Tool

-                                Name="VCPreBuildEventTool"

-                        />

-                        <Tool

-                                Name="VCCustomBuildTool"

-                        />

-                        <Tool

-                                Name="VCXMLDataGeneratorTool"

-                        />

-                        <Tool

-                                Name="VCWebServiceProxyGeneratorTool"

-                        />

-                        <Tool

-                                Name="VCMIDLTool"

-                                TargetEnvironment="3"

-                        />

-                        <Tool

-                                Name="VCCLCompilerTool"

-                                Optimization="0"

-                                AdditionalIncludeDirectories="../../Core/Common/Src;../../PluginSpecs;../../../Externals/SOIL"

-                                PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_SECURE_SCL=0;_LIB;__WXMSW__;wxUSE_BASE=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"

-                                MinimalRebuild="true"

-                                BasicRuntimeChecks="3"

-                                RuntimeLibrary="1"

-                                BufferSecurityCheck="false"

-                                UsePrecompiledHeader="0"

-                                WarningLevel="3"

-                                DebugInformationFormat="3"

-                        />

-                        <Tool

-                                Name="VCManagedResourceCompilerTool"

-                        />

-                        <Tool

-                                Name="VCResourceCompilerTool"

-                        />

-                        <Tool

-                                Name="VCPreLinkEventTool"

-                        />

-                        <Tool

-                                Name="VCLibrarianTool"

-                        />

-                        <Tool

-                                Name="VCALinkTool"

-                        />

-                        <Tool

-                                Name="VCXDCMakeTool"

-                        />

-                        <Tool

-                                Name="VCBscMakeTool"

-                        />

-                        <Tool

-                                Name="VCFxCopTool"

-                        />

-                        <Tool

-                                Name="VCPostBuildEventTool"

-                        />

-                </Configuration>

-                <Configuration

-                        Name="Release|x64"

-                        OutputDirectory="$(PlatformName)\$(ConfigurationName)"

-                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

-                        ConfigurationType="4"

-                        CharacterSet="1"

-                        WholeProgramOptimization="1"

-                        >

-                        <Tool

-                                Name="VCPreBuildEventTool"

-                        />

-                        <Tool

-                                Name="VCCustomBuildTool"

-                        />

-                        <Tool

-                                Name="VCXMLDataGeneratorTool"

-                        />

-                        <Tool

-                                Name="VCWebServiceProxyGeneratorTool"

-                        />

-                        <Tool

-                                Name="VCMIDLTool"

-                                TargetEnvironment="3"

-                        />

-                        <Tool

-                                Name="VCCLCompilerTool"

-                                Optimization="2"

-                                EnableIntrinsicFunctions="true"

-                                FavorSizeOrSpeed="1"

-                                OmitFramePointers="false"

-                                AdditionalIncludeDirectories="../../Core/Common/Src;../../PluginSpecs;../../../Externals/SOIL"

-                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"

-                                RuntimeLibrary="0"

-                                BufferSecurityCheck="false"

-                                UsePrecompiledHeader="0"

-                                WarningLevel="3"

-                                DebugInformationFormat="3"

-                        />

-                        <Tool

-                                Name="VCManagedResourceCompilerTool"

-                        />

-                        <Tool

-                                Name="VCResourceCompilerTool"

-                        />

-                        <Tool

-                                Name="VCPreLinkEventTool"

-                        />

-                        <Tool

-                                Name="VCLibrarianTool"

-                        />

-                        <Tool

-                                Name="VCALinkTool"

-                        />

-                        <Tool

-                                Name="VCXDCMakeTool"

-                        />

-                        <Tool

-                                Name="VCBscMakeTool"

-                        />

-                        <Tool

-                                Name="VCFxCopTool"

-                        />

-                        <Tool

-                                Name="VCPostBuildEventTool"

-                        />

-                </Configuration>

-                <Configuration

-                        Name="DebugFast|x64"

-                        OutputDirectory="$(PlatformName)\$(ConfigurationName)"

-                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

-                        ConfigurationType="4"

-                        CharacterSet="1"

-                        WholeProgramOptimization="1"

-                        >

-                        <Tool

-                                Name="VCPreBuildEventTool"

-                        />

-                        <Tool

-                                Name="VCCustomBuildTool"

-                        />

-                        <Tool

-                                Name="VCXMLDataGeneratorTool"

-                        />

-                        <Tool

-                                Name="VCWebServiceProxyGeneratorTool"

-                        />

-                        <Tool

-                                Name="VCMIDLTool"

-                                TargetEnvironment="3"

-                        />

-                        <Tool

-                                Name="VCCLCompilerTool"

-                                AdditionalIncludeDirectories="../../Core/Common/Src;../../PluginSpecs;../../../Externals/SOIL"

-                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;__WXMSW__;wxUSE_BASE=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"

-                                RuntimeLibrary="0"

-                                BufferSecurityCheck="false"

-                                UsePrecompiledHeader="0"

-                                WarningLevel="3"

-                                DebugInformationFormat="3"

-                        />

-                        <Tool

-                                Name="VCManagedResourceCompilerTool"

-                        />

-                        <Tool

-                                Name="VCResourceCompilerTool"

-                        />

-                        <Tool

-                                Name="VCPreLinkEventTool"

-                        />

-                        <Tool

-                                Name="VCLibrarianTool"

-                        />

-                        <Tool

-                                Name="VCALinkTool"

-                        />

-                        <Tool

-                                Name="VCXDCMakeTool"

-                        />

-                        <Tool

-                                Name="VCBscMakeTool"

-                        />

-                        <Tool

-                                Name="VCFxCopTool"

-

-                        />

-                        <Tool

-                                Name="VCPostBuildEventTool"

-                        />

-                </Configuration>

-        </Configurations>

-        <References>

-        </References>

-        <Files>

-                <Filter

-                        Name="ShaderGenerators"

-                        >

-                        <File

-                                RelativePath=".\Src\PixelShaderGen.cpp"

-                                >

-                        </File>

-                        <File

-                                RelativePath=".\Src\PixelShaderGen.h"

-                                >

-                        </File>

-                        <File

-                                RelativePath=".\Src\VertexShaderGen.cpp"

-                                >

-                        </File>

-                        <File

-                                RelativePath=".\Src\VertexShaderGen.h"

-                                >

-                        </File>

-                </Filter>

-                <Filter

-                        Name="Sections"

-                        >

-                        <File

-                                RelativePath=".\Src\BPMemory.cpp"

-                                >

-                        </File>

-                        <File

-                                RelativePath=".\Src\BPMemory.h"

-                                >

-                        </File>

-                        <File

-                                RelativePath=".\Src\CPMemory.cpp"

-                                >

-                        </File>

-                        <File

-                                RelativePath=".\Src\CPMemory.h"

-                                >

-                        </File>

-                        <File

-                                RelativePath=".\Src\XFMemory.cpp"

-                                >

-                        </File>

-                        <File

-                                RelativePath=".\Src\XFMemory.h"

-                                >

-                        </File>

-                        <File

-                                RelativePath=".\Src\XFStructs.cpp"

-                                >

-                        </File>

-                        <File

-                                RelativePath=".\Src\XFStructs.h"

-                                >

-                        </File>

-                </Filter>

-                <Filter

-                        Name="ShaderManagers"

-                        >

-                        <File

-                                RelativePath=".\Src\PixelShaderManager.cpp"

-                                >

-                        </File>

-                        <File

-                                RelativePath=".\Src\PixelShaderManager.h"

-                                >

-                        </File>

-                        <File

-                                RelativePath=".\Src\VertexShaderManager.cpp"

-                                >

-                        </File>

-                        <File

-                                RelativePath=".\Src\VertexShaderManager.h"

-                                >

-                        </File>

-                </Filter>

-                <Filter

-                        Name="Util"

-                        >

-                        <File

-                                RelativePath=".\Src\AVIDump.cpp"

-                                >

-                        </File>

-                        <File

-                                RelativePath=".\Src\AVIDump.h"

-                                >

-                        </File>

-                        <File

-                                RelativePath=".\Src\ImageWrite.cpp"

-                                >

-                        </File>

-                        <File

-                                RelativePath=".\Src\ImageWrite.h"

-                                >

-                        </File>

-                        <File

-                                RelativePath=".\Src\IndexGenerator.cpp"

-                                >

-                        </File>

-                        <File

-                                RelativePath=".\Src\IndexGenerator.h"

-                                >

-                        </File>

-                        <File

-                                RelativePath=".\Src\LookUpTables.cpp"

-                                >

-                        </File>

-                        <File

-                                RelativePath=".\Src\LookUpTables.h"

-                                >

-                        </File>

-                        <File

-                                RelativePath=".\Src\Profiler.cpp"

-                                >

-                        </File>

-                        <File

-                                RelativePath=".\Src\Profiler.h"

-                                >

-                        </File>

-                        <File

-                                RelativePath=".\Src\Statistics.cpp"

-                                >

-                        </File>

-                        <File

-                                RelativePath=".\Src\Statistics.h"

-                                >

-                        </File>

-                        <File

-                                RelativePath=".\Src\VideoState.cpp"

-                                >

-                        </File>

-                        <File

-                                RelativePath=".\Src\VideoState.h"

-                                >

-                        </File>

-                        <File

-                                RelativePath=".\Src\XFBConvert.cpp"

-                                >

-                                <FileConfiguration

-                                        Name="Release|Win32"

-                                        >

-                                        <Tool

-                                                Name="VCCLCompilerTool"

-                                                AssemblerOutput="4"

-                                        />

-                                </FileConfiguration>

-                                <FileConfiguration

-                                        Name="Release|x64"

-                                        >

-                                        <Tool

-                                                Name="VCCLCompilerTool"

-                                                AssemblerOutput="4"

-                                        />

-                                </FileConfiguration>

-                        </File>

-                        <File

-                                RelativePath=".\Src\XFBConvert.h"

-                                >

-                        </File>

-                </Filter>

-                <Filter

-                        Name="VertexLoading"

-                        >

-                        <File

-                                RelativePath=".\Src\VertexLoader.cpp"

-                                >

-                        </File>

-                        <File

-                                RelativePath=".\Src\VertexLoader.h"

-                                >

-                        </File>

-                        <File

-                                RelativePath=".\Src\VertexLoader_Color.cpp"

-                                >

-                        </File>

-                        <File

-                                RelativePath=".\Src\VertexLoader_Color.h"

-                                >

-                        </File>

-                        <File

-                                RelativePath=".\Src\VertexLoader_Normal.cpp"

-                                >

-                        </File>

-                        <File

-                                RelativePath=".\Src\VertexLoader_Normal.h"

-                                >

-                        </File>

-                        <File

-                                RelativePath=".\Src\VertexLoader_Position.cpp"

-                                >

-                        </File>

-                        <File

-                                RelativePath=".\Src\VertexLoader_Position.h"

-                                >

-                        </File>

-                        <File

-                                RelativePath=".\Src\VertexLoader_TextCoord.cpp"

-                                >

-                        </File>

-                        <File

-                                RelativePath=".\Src\VertexLoader_TextCoord.h"

-                                >

-                        </File>

-                </Filter>

-                <File

-                        RelativePath=".\Src\BPFunctions.h"

-                        >

-                </File>

-                <File

-                        RelativePath=".\Src\BPStructs.cpp"

-                        >

-                </File>

-                <File

-                        RelativePath=".\Src\BPStructs.h"

-                        >

-                </File>

-                <File

-                        RelativePath=".\Src\DataReader.h"

-                        >

-                </File>

-                <File

-                        RelativePath=".\Src\Fifo.cpp"

-                        >

-                </File>

-                <File

-                        RelativePath=".\Src\Fifo.h"

-                        >

-                </File>

-                <File

-                        RelativePath=".\Src\HiresTextures.cpp"

-                        >

-                </File>

-                <File

-                        RelativePath=".\Src\HiresTextures.h"

-                        >

-                </File>

-                <File

-                        RelativePath=".\Src\memcpy_amd.cpp"

-                        >

-                </File>

-                <File

-                        RelativePath=".\Src\NativeVertexFormat.h"

-                        >

-                </File>

-                <File

-                        RelativePath=".\Src\NativeVertexWriter.cpp"

-                        >

-                </File>

-                <File

-                        RelativePath=".\Src\NativeVertexWriter.h"

-                        >

-                </File>

-                <File

-                        RelativePath=".\Src\OpcodeDecoding.cpp"

-                        >

-                </File>

-                <File

-                        RelativePath=".\Src\OpcodeDecoding.h"

-                        >

-                </File>

-                <File

-                        RelativePath=".\Src\SConscript"

-                        >

-                </File>

-                <File

-                        RelativePath=".\Src\TextureDecoder.cpp"

-                        >

-                </File>

-                <File

-                        RelativePath=".\Src\TextureDecoder.h"

-                        >

-                </File>

-                <File

-                        RelativePath=".\Src\VertexLoaderManager.cpp"

-                        >

-                </File>

-                <File

-                        RelativePath=".\Src\VertexLoaderManager.h"

-                        >

-                </File>

-                <File

-                        RelativePath=".\Src\VideoCommon.h"

-                        >

-                </File>

-        </Files>

-        <Globals>

-        </Globals>

+	ProjectType="Visual C++"

+	Version="9.00"

+	Name="VideoCommon"

+	ProjectGUID="{E5D1F0C0-AA07-4841-A4EB-4CF4DAA6B0FA}"

+	RootNamespace="VideoCommon"

+	Keyword="Win32Proj"

+	TargetFrameworkVersion="131072"

+	>

+	<Platforms>

+		<Platform

+			Name="Win32"

+		/>

+		<Platform

+			Name="x64"

+		/>

+	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

+	<Configurations>

+		<Configuration

+			Name="Debug|Win32"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="4"

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="../../../Externals/SOIL;../../Core/Common/Src;../../PluginSpecs"

+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"

+				MinimalRebuild="true"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				BufferSecurityCheck="false"

+				UsePrecompiledHeader="0"

+				WarningLevel="3"

+				DebugInformationFormat="4"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLibrarianTool"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|x64"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="4"

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="3"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="../../../Externals/SOIL;../../Core/Common/Src;../../PluginSpecs"

+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_SECURE_SCL=0;_LIB;__WXMSW__;wxUSE_BASE=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"

+				MinimalRebuild="true"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				BufferSecurityCheck="false"

+				UsePrecompiledHeader="0"

+				WarningLevel="3"

+				DebugInformationFormat="3"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLibrarianTool"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|Win32"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="4"

+			CharacterSet="1"

+			WholeProgramOptimization="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				EnableIntrinsicFunctions="true"

+				AdditionalIncludeDirectories="../../../Externals/SOIL;../../Core/Common/Src;../../PluginSpecs"

+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				BufferSecurityCheck="false"

+				EnableEnhancedInstructionSet="2"

+				FloatingPointModel="0"

+				UsePrecompiledHeader="0"

+				WarningLevel="3"

+				DebugInformationFormat="3"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLibrarianTool"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|x64"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="4"

+			CharacterSet="1"

+			WholeProgramOptimization="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="3"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				EnableIntrinsicFunctions="true"

+				FavorSizeOrSpeed="1"

+				OmitFramePointers="false"

+				AdditionalIncludeDirectories="../../../Externals/SOIL;../../Core/Common/Src;../../PluginSpecs"

+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"

+				RuntimeLibrary="0"

+				BufferSecurityCheck="false"

+				UsePrecompiledHeader="0"

+				WarningLevel="3"

+				DebugInformationFormat="3"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLibrarianTool"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="DebugFast|Win32"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="4"

+			CharacterSet="1"

+			WholeProgramOptimization="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				AdditionalIncludeDirectories="../../../Externals/SOIL;../../Core/Common/Src;../../PluginSpecs"

+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"

+				RuntimeLibrary="0"

+				BufferSecurityCheck="false"

+				UsePrecompiledHeader="0"

+				WarningLevel="3"

+				DebugInformationFormat="3"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLibrarianTool"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="DebugFast|x64"

+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

+			ConfigurationType="4"

+			CharacterSet="1"

+			WholeProgramOptimization="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="3"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				AdditionalIncludeDirectories="../../../Externals/SOIL;../../Core/Common/Src;../../PluginSpecs"

+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;__WXMSW__;wxUSE_BASE=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"

+				RuntimeLibrary="0"

+				BufferSecurityCheck="false"

+				UsePrecompiledHeader="0"

+				WarningLevel="3"

+				DebugInformationFormat="3"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLibrarianTool"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+	</Configurations>

+	<References>

+	</References>

+	<Files>

+		<Filter

+			Name="ShaderGenerators"

+			>

+			<File

+				RelativePath=".\Src\PixelShaderGen.cpp"

+				>

+			</File>

+			<File

+				RelativePath=".\Src\PixelShaderGen.h"

+				>

+			</File>

+			<File

+				RelativePath=".\Src\VertexShaderGen.cpp"

+				>

+			</File>

+			<File

+				RelativePath=".\Src\VertexShaderGen.h"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="Sections"

+			>

+			<File

+				RelativePath=".\Src\BPMemory.cpp"

+				>

+			</File>

+			<File

+				RelativePath=".\Src\BPMemory.h"

+				>

+			</File>

+			<File

+				RelativePath=".\Src\CPMemory.cpp"

+				>

+			</File>

+			<File

+				RelativePath=".\Src\CPMemory.h"

+				>

+			</File>

+			<File

+				RelativePath=".\Src\XFMemory.cpp"

+				>

+			</File>

+			<File

+				RelativePath=".\Src\XFMemory.h"

+				>

+			</File>

+			<File

+				RelativePath=".\Src\XFStructs.cpp"

+				>

+			</File>

+			<File

+				RelativePath=".\Src\XFStructs.h"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="ShaderManagers"

+			>

+			<File

+				RelativePath=".\Src\PixelShaderManager.cpp"

+				>

+			</File>

+			<File

+				RelativePath=".\Src\PixelShaderManager.h"

+				>

+			</File>

+			<File

+				RelativePath=".\Src\VertexShaderManager.cpp"

+				>

+			</File>

+			<File

+				RelativePath=".\Src\VertexShaderManager.h"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="Util"

+			>

+			<File

+				RelativePath=".\Src\AVIDump.cpp"

+				>

+			</File>

+			<File

+				RelativePath=".\Src\AVIDump.h"

+				>

+			</File>

+			<File

+				RelativePath=".\Src\ImageWrite.cpp"

+				>

+			</File>

+			<File

+				RelativePath=".\Src\ImageWrite.h"

+				>

+			</File>

+			<File

+				RelativePath=".\Src\IndexGenerator.cpp"

+				>

+			</File>

+			<File

+				RelativePath=".\Src\IndexGenerator.h"

+				>

+			</File>

+			<File

+				RelativePath=".\Src\LookUpTables.cpp"

+				>

+			</File>

+			<File

+				RelativePath=".\Src\LookUpTables.h"

+				>

+			</File>

+			<File

+				RelativePath=".\Src\Profiler.cpp"

+				>

+			</File>

+			<File

+				RelativePath=".\Src\Profiler.h"

+				>

+			</File>

+			<File

+				RelativePath=".\Src\Statistics.cpp"

+				>

+			</File>

+			<File

+				RelativePath=".\Src\Statistics.h"

+				>

+			</File>

+			<File

+				RelativePath=".\Src\VideoState.cpp"

+				>

+			</File>

+			<File

+				RelativePath=".\Src\VideoState.h"

+				>

+			</File>

+			<File

+				RelativePath=".\Src\XFBConvert.cpp"

+				>

+				<FileConfiguration

+					Name="Release|Win32"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						AssemblerOutput="4"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|x64"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+						AssemblerOutput="4"

+					/>

+				</FileConfiguration>

+			</File>

+			<File

+				RelativePath=".\Src\XFBConvert.h"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="VertexLoading"

+			>

+			<File

+				RelativePath=".\Src\VertexLoader.cpp"

+				>

+			</File>

+			<File

+				RelativePath=".\Src\VertexLoader.h"

+				>

+			</File>

+			<File

+				RelativePath=".\Src\VertexLoader_Color.cpp"

+				>

+			</File>

+			<File

+				RelativePath=".\Src\VertexLoader_Color.h"

+				>

+			</File>

+			<File

+				RelativePath=".\Src\VertexLoader_Normal.cpp"

+				>

+			</File>

+			<File

+				RelativePath=".\Src\VertexLoader_Normal.h"

+				>

+			</File>

+			<File

+				RelativePath=".\Src\VertexLoader_Position.cpp"

+				>

+			</File>

+			<File

+				RelativePath=".\Src\VertexLoader_Position.h"

+				>

+			</File>

+			<File

+				RelativePath=".\Src\VertexLoader_TextCoord.cpp"

+				>

+			</File>

+			<File

+				RelativePath=".\Src\VertexLoader_TextCoord.h"

+				>

+			</File>

+		</Filter>

+		<File

+			RelativePath=".\Src\BPFunctions.h"

+			>

+		</File>

+		<File

+			RelativePath=".\Src\BPStructs.cpp"

+			>

+		</File>

+		<File

+			RelativePath=".\Src\BPStructs.h"

+			>

+		</File>

+		<File

+			RelativePath=".\Src\DataReader.h"

+			>

+		</File>

+		<File

+			RelativePath=".\Src\Fifo.cpp"

+			>

+		</File>

+		<File

+			RelativePath=".\Src\Fifo.h"

+			>

+		</File>

+		<File

+			RelativePath=".\Src\HiresTextures.cpp"

+			>

+		</File>

+		<File

+			RelativePath=".\Src\HiresTextures.h"

+			>

+		</File>

+		<File

+			RelativePath=".\Src\memcpy_amd.cpp"

+			>

+		</File>

+		<File

+			RelativePath=".\Src\NativeVertexFormat.h"

+			>

+		</File>

+		<File

+			RelativePath=".\Src\NativeVertexWriter.cpp"

+			>

+		</File>

+		<File

+			RelativePath=".\Src\NativeVertexWriter.h"

+			>

+		</File>

+		<File

+			RelativePath=".\Src\OpcodeDecoding.cpp"

+			>

+		</File>

+		<File

+			RelativePath=".\Src\OpcodeDecoding.h"

+			>

+		</File>

+		<File

+			RelativePath=".\Src\SConscript"

+			>

+		</File>

+		<File

+			RelativePath=".\Src\TextureDecoder.cpp"

+			>

+		</File>

+		<File

+			RelativePath=".\Src\TextureDecoder.h"

+			>

+		</File>

+		<File

+			RelativePath=".\Src\VertexLoaderManager.cpp"

+			>

+		</File>

+		<File

+			RelativePath=".\Src\VertexLoaderManager.h"

+			>

+		</File>

+		<File

+			RelativePath=".\Src\VideoCommon.h"

+			>

+		</File>

+	</Files>

+	<Globals>

+	</Globals>

 </VisualStudioProject>

diff --git a/Source/Dolphin.sln b/Source/Dolphin.sln
index 16a702f181..d8b3cc9072 100644
--- a/Source/Dolphin.sln
+++ b/Source/Dolphin.sln
@@ -82,6 +82,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Debugger", "Core\DebuggerWX
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VideoCommon", "Core\VideoCommon\VideoCommon.vcproj", "{E5D1F0C0-AA07-4841-A4EB-4CF4DAA6B0FA}"

 	ProjectSection(ProjectDependencies) = postProject

+		{C0B84DA9-FF15-4FAB-9590-17132F3C6DE4} = {C0B84DA9-FF15-4FAB-9590-17132F3C6DE4}

 		{C573CAF7-EE6A-458E-8049-16C0BF34C2E9} = {C573CAF7-EE6A-458E-8049-16C0BF34C2E9}

 	EndProjectSection

 EndProject

diff --git a/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcproj b/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcproj
index 3d110544d3..2f6ad843d2 100644
--- a/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcproj
+++ b/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcproj
@@ -57,7 +57,7 @@
 				EnableIntrinsicFunctions="true"

 				OmitFramePointers="true"

 				WholeProgramOptimization="true"

-				AdditionalIncludeDirectories="../../PluginSpecs;../../Core/Common/Src;../../Core/InputCommon/Src;../../Core/VideoCommon/Src;./Src;./Src/Windows;../../../Externals;..\..\..\Externals\libjpeg;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\..\Externals\Glew;..\..\..\Externals\SOIL"

+				AdditionalIncludeDirectories="../../PluginSpecs;../../Core/Common/Src;../../Core/InputCommon/Src;../../Core/VideoCommon/Src;./Src;./Src/Windows;../../../Externals;..\..\..\Externals\libjpeg;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\..\Externals\Glew"

 				PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"

 				StringPooling="true"

 				RuntimeLibrary="0"

@@ -90,11 +90,11 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="comctl32.lib winmm.lib cg.lib cgGL.lib opengl32.lib glew32s.lib libjpeg.lib glu32.lib rpcrt4.lib vfw32.lib SOIL.lib"

+				AdditionalDependencies="comctl32.lib winmm.lib cg.lib cgGL.lib opengl32.lib glew32s.lib libjpeg.lib glu32.lib rpcrt4.lib vfw32.lib"

 				OutputFile="..\..\..\Binary\Win32\Plugins\Plugin_VideoOGL.dll"

 				LinkIncremental="1"

 				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="..\..\..\Externals\Cg;..\..\..\Externals\GLew;..\..\..\Externals\libjpeg;..\..\..\Externals\SOIL\$(OutDir)"

+				AdditionalLibraryDirectories="..\..\..\Externals\Cg;..\..\..\Externals\GLew;..\..\..\Externals\libjpeg"

 				GenerateManifest="false"

 				ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)\$(TargetName).pdb"

 				RandomizedBaseAddress="1"

@@ -133,6 +133,7 @@
 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

+			WholeProgramOptimization="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -163,7 +164,7 @@
 				FavorSizeOrSpeed="1"

 				OmitFramePointers="false"

 				WholeProgramOptimization="true"

-				AdditionalIncludeDirectories="../../PluginSpecs;../../Core/Common/Src;../../Core/InputCommon/Src;../../Core/VideoCommon/Src;./Src;./Src/Windows;../../../Externals;..\..\..\Externals\libjpeg;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\..\Externals\Glew;..\..\..\Externals\SOIL"

+				AdditionalIncludeDirectories="../../PluginSpecs;../../Core/Common/Src;../../Core/InputCommon/Src;../../Core/VideoCommon/Src;./Src;./Src/Windows;../../../Externals;..\..\..\Externals\libjpeg;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\..\Externals\Glew"

 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"

 				StringPooling="true"

 				ExceptionHandling="1"

@@ -198,11 +199,11 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="comctl32.lib winmm.lib cg.lib cgGL.lib opengl32.lib libjpeg64.lib glu32.lib rpcrt4.lib glew64s.lib vfw32.lib SOIL.lib"

+				AdditionalDependencies="comctl32.lib winmm.lib cg.lib cgGL.lib opengl32.lib libjpeg64.lib glu32.lib rpcrt4.lib glew64s.lib vfw32.lib"

 				OutputFile="..\..\..\Binary\x64\Plugins\Plugin_VideoOGL.dll"

 				LinkIncremental="1"

 				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="..\..\..\Externals\Cg64;..\..\..\Externals\GLew;..\..\..\Externals\libjpeg;..\..\..\Externals\SOIL\$(OutDir)"

+				AdditionalLibraryDirectories="..\..\..\Externals\Cg64;..\..\..\Externals\GLew;..\..\..\Externals\libjpeg"

 				GenerateManifest="false"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)\$(TargetName).pdb"

@@ -268,7 +269,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="../../PluginSpecs;../../Core/Common/Src;../../Core/InputCommon/Src;../../Core/VideoCommon/Src;./Src;./Src/Windows;../../../Externals;..\..\..\Externals\libjpeg;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\..\Externals\Glew;..\..\..\Externals\SOIL"

+				AdditionalIncludeDirectories="../../PluginSpecs;../../Core/Common/Src;../../Core/InputCommon/Src;../../Core/VideoCommon/Src;./Src;./Src/Windows;../../../Externals;..\..\..\Externals\libjpeg;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\..\Externals\Glew"

 				PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="1"

@@ -297,11 +298,11 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="odbc32.lib odbccp32.lib comctl32.lib winmm.lib cg.lib cgGL.lib opengl32.lib glew32s.lib libjpeg.lib glu32.lib rpcrt4.lib vfw32.lib SOIL.lib"

+				AdditionalDependencies="odbc32.lib odbccp32.lib comctl32.lib winmm.lib cg.lib cgGL.lib opengl32.lib glew32s.lib libjpeg.lib glu32.lib rpcrt4.lib vfw32.lib"

 				OutputFile="..\..\..\Binary\Win32/Plugins\Plugin_VideoOGLD.dll"

 				LinkIncremental="1"

 				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="..\..\..\Externals\Cg;..\..\..\Externals\GLew;..\..\..\Externals\libjpeg;..\..\..\Externals\SOIL\$(OutDir)"

+				AdditionalLibraryDirectories="..\..\..\Externals\Cg;..\..\..\Externals\GLew;..\..\..\Externals\libjpeg"

 				GenerateManifest="false"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)\$(TargetName).pdb"

@@ -366,7 +367,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="../../PluginSpecs;../../Core/Common/Src;../../Core/InputCommon/Src;../../Core/VideoCommon/Src;./Src;./Src/Windows;../../../Externals;..\..\..\Externals\libjpeg;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\..\Externals\Glew;..\..\..\Externals\SOIL"

+				AdditionalIncludeDirectories="../../PluginSpecs;../../Core/Common/Src;../../Core/InputCommon/Src;../../Core/VideoCommon/Src;./Src;./Src/Windows;../../../Externals;..\..\..\Externals\libjpeg;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\..\Externals\Glew"

 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="1"

@@ -395,11 +396,11 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="comctl32.lib winmm.lib cg.lib cgGL.lib opengl32.lib libjpeg64.lib glu32.lib glew64s.lib rpcrt4.lib vfw32.lib SOIL.lib"

+				AdditionalDependencies="comctl32.lib winmm.lib cg.lib cgGL.lib opengl32.lib libjpeg64.lib glu32.lib glew64s.lib rpcrt4.lib vfw32.lib"

 				OutputFile="..\..\..\Binary\x64\Plugins\Plugin_VideoOGLD.dll"

 				LinkIncremental="1"

 				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="..\..\..\Externals\Cg64;..\..\..\Externals\GLew;..\..\..\Externals\libjpeg;..\..\..\Externals\SOIL\$(OutDir)"

+				AdditionalLibraryDirectories="..\..\..\Externals\Cg64;..\..\..\Externals\GLew;..\..\..\Externals\libjpeg"

 				GenerateManifest="false"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)\$(TargetName).pdb"

@@ -470,7 +471,7 @@
 				EnableIntrinsicFunctions="true"

 				OmitFramePointers="true"

 				WholeProgramOptimization="false"

-				AdditionalIncludeDirectories="../../PluginSpecs;../../Core/Common/Src;../../Core/InputCommon/Src;../../Core/VideoCommon/Src;./Src;./Src/Windows;../../../Externals;..\..\..\Externals\libjpeg;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\..\Externals\Glew;..\..\..\Externals\SOIL"

+				AdditionalIncludeDirectories="../../PluginSpecs;../../Core/Common/Src;../../Core/InputCommon/Src;../../Core/VideoCommon/Src;./Src;./Src/Windows;../../../Externals;..\..\..\Externals\libjpeg;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\..\Externals\Glew"

 				PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;DEBUGFAST"

 				StringPooling="true"

 				RuntimeLibrary="0"

@@ -503,11 +504,11 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="comctl32.lib winmm.lib cg.lib cgGL.lib opengl32.lib glew32s.lib libjpeg.lib glu32.lib rpcrt4.lib vfw32.lib SOIL.lib"

+				AdditionalDependencies="comctl32.lib winmm.lib cg.lib cgGL.lib opengl32.lib glew32s.lib libjpeg.lib glu32.lib rpcrt4.lib vfw32.lib"

 				OutputFile="..\..\..\Binary\Win32\Plugins\Plugin_VideoOGLDF.dll"

 				LinkIncremental="1"

 				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="..\..\..\Externals\Cg;..\..\..\Externals\GLew;..\..\..\Externals\libjpeg;..\..\..\Externals\SOIL\$(OutDir)"

+				AdditionalLibraryDirectories="..\..\..\Externals\Cg;..\..\..\Externals\GLew;..\..\..\Externals\libjpeg"

 				GenerateManifest="false"

 				IgnoreDefaultLibraryNames="LIBCMTD.lib"

 				GenerateDebugInformation="true"

@@ -579,7 +580,7 @@
 				FavorSizeOrSpeed="1"

 				OmitFramePointers="false"

 				WholeProgramOptimization="false"

-				AdditionalIncludeDirectories="../../PluginSpecs;../../Core/Common/Src;../../Core/InputCommon/Src;../../Core/VideoCommon/Src;./Src;./Src/Windows;../../../Externals;..\..\..\Externals\libjpeg;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\..\Externals\Glew;..\..\..\Externals\SOIL"

+				AdditionalIncludeDirectories="../../PluginSpecs;../../Core/Common/Src;../../Core/InputCommon/Src;../../Core/VideoCommon/Src;./Src;./Src/Windows;../../../Externals;..\..\..\Externals\libjpeg;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\..\Externals\Glew"

 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;DEBUGFAST"

 				StringPooling="true"

 				ExceptionHandling="1"

@@ -613,11 +614,11 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="comctl32.lib winmm.lib cg.lib cgGL.lib opengl32.lib libjpeg64.lib glu32.lib glew64s.lib rpcrt4.lib vfw32.lib SOIL.lib"

+				AdditionalDependencies="comctl32.lib winmm.lib cg.lib cgGL.lib opengl32.lib libjpeg64.lib glu32.lib glew64s.lib rpcrt4.lib vfw32.lib"

 				OutputFile="..\..\..\Binary\x64\Plugins\Plugin_VideoOGLDF.dll"

 				LinkIncremental="1"

 				SuppressStartupBanner="true"

-				AdditionalLibraryDirectories="..\..\..\Externals\Cg64;..\..\..\Externals\GLew;..\..\..\Externals\libjpeg;..\..\..\Externals\SOIL\$(OutDir)"

+				AdditionalLibraryDirectories="..\..\..\Externals\Cg64;..\..\..\Externals\GLew;..\..\..\Externals\libjpeg"

 				GenerateManifest="false"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)\$(TargetName).pdb"