diff --git a/Branches/MusicMod/Player/Player.vcproj b/Branches/MusicMod/Player/Player.vcproj
new file mode 100644
index 0000000000..e36e8cee91
--- /dev/null
+++ b/Branches/MusicMod/Player/Player.vcproj
@@ -0,0 +1,902 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="Player"
+	ProjectGUID="{0B72B5D6-5D72-4391-84A7-9CCA5392668A}"
+	RootNamespace="Plainamp"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\..\..\Binary\win32\"
+			IntermediateDirectory="Debug"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG"
+				MinimalRebuild="false"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libzlib1.lib comctl32.lib LIBCMTD.LIB winmm.lib"
+				OutputFile="$(OutDir)/Plainamp.dll"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="Lib"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
+				SubSystem="0"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				ImportLibrary="$(TargetDir)$(TargetName).lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
+				MinimalRebuild="false"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libzlib1.lib comctl32.lib winmm.lib"
+				OutputFile="$(OutDir)/Plainamp.dll"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="..\..\Lib"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
+				SubSystem="0"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				ImportLibrary="$(TargetDir)$(TargetName).lib"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\..\..\Binary\win32\"
+			IntermediateDirectory="Release"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="true"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/NODEFAULTLIB:msvcrt"
+				AdditionalDependencies="libzlib1.lib comctl32.lib winmm.lib"
+				OutputFile="$(OutDir)/Plainamp.dll"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="Lib"
+				GenerateDebugInformation="false"
+				SubSystem="0"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				EntryPointSymbol=""
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="..\..\..\..\Dolphin\Binary\x64\"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="true"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libzlib1.lib comctl32.lib winmm.lib"
+				OutputFile="$(OutDir)/Plainamp.dll"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="Lib"
+				GenerateDebugInformation="false"
+				SubSystem="0"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				EntryPointSymbol=""
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+		</Filter>
+		<Filter
+			Name="Externals"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<Filter
+				Name="fftw3"
+				>
+				<File
+					RelativePath="..\..\Source\fftw3\fftw3.h"
+					>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|x64"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+						/>
+					</FileConfiguration>
+				</File>
+			</Filter>
+			<Filter
+				Name="Winamp"
+				>
+				<File
+					RelativePath="..\..\Source\Winamp\Dsp.h"
+					>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|x64"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\Source\Winamp\Gen.h"
+					>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|x64"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\Source\Winamp\In2.h"
+					>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|x64"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\Source\Winamp\Out.h"
+					>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|x64"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\Source\Winamp\Vis.h"
+					>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|x64"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\Source\Winamp\wa_ipc.h"
+					>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|x64"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\Source\Winamp\wa_msgids.h"
+					>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|x64"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+						/>
+					</FileConfiguration>
+				</File>
+			</Filter>
+			<Filter
+				Name="zlib"
+				>
+				<File
+					RelativePath="..\..\Source\zlib\zconf.h"
+					>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|x64"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\Source\zlib\zlib.h"
+					>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|x64"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+						/>
+					</FileConfiguration>
+				</File>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+			<File
+				RelativePath=".\Src\Resources\Buttons.bmp"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\Resources\Plainamp.ico"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\Resources\resrc1.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\Resources\resrc1.rc"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Playlist"
+			>
+			<File
+				RelativePath=".\Src\Playlist.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\Playlist.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\PlaylistControler.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\PlaylistControler.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\PlaylistModel.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\PlaylistView.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\PlaylistView.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Plugins"
+			>
+			<File
+				RelativePath=".\Src\Plugin.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\Plugin.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\PluginManager.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\PluginManager.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="MusicMod"
+			>
+			<File
+				RelativePath=".\Src\Global.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\Main.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\Main.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\Playback.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\Playback.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\Player.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\PlayerExport.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\PlayerExport.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\Timer.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="EmaBox"
+			>
+			<File
+				RelativePath=".\Src\Emabox\Emabox.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\Emabox\Emabox.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\Emabox\EmaboxConfig.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Other"
+			>
+			<File
+				RelativePath=".\Src\AddDirectory.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\AddDirectory.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\AddFiles.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\AddFiles.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\afxres.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\Config.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\Config.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\Console.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\Console.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\DspModule.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\DspModule.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\DspPlugin.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\DspPlugin.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\Embed.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\Embed.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\Font.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\Font.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\GenPlugin.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\GenPlugin.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\GlobalVersion.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\Input.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\Input.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\InputPlugin.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\InputPlugin.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\Lock.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\Lock.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\Output.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\Output.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\OutputPlugin.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\OutputPlugin.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\Path.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\Path.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\PlaybackEq.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\PlaybackOrder.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\Prefs.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\Prefs.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\Rebar.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\Rebar.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\Status.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\Status.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\Unicode.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\Unicode.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\Util.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\Util.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\VisCache.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\VisCache.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\VisModule.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\VisModule.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\VisPlugin.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\VisPlugin.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\Winamp.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\Winamp.h"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/Source/Core/DolphinWX/DolphinWX.vcproj b/Source/Core/DolphinWX/DolphinWX.vcproj
index d8e3b8c8e3..1f4ce8b35f 100644
--- a/Source/Core/DolphinWX/DolphinWX.vcproj
+++ b/Source/Core/DolphinWX/DolphinWX.vcproj
@@ -30,6 +30,7 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 				CommandLine="&quot;$(ProjectDir)..\Common\SubWCRev.exe&quot; &quot;$(SolutionDir)\.&quot; &quot;$(ProjectDir)..\Common\src\svnrev_template.h&quot; &quot;$(ProjectDir)..\Common\src\svnrev.h&quot;"
+				ExcludedFromBuild="false"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -89,15 +90,16 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/NODEFAULTLIB:msvcrt.lib"
 				AdditionalDependencies="comctl32.lib rpcrt4.lib winmm.lib LZO.lib"
 				OutputFile="../../../Binary/Win32/DolphinWx.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\..\Externals\wxWidgets\lib;..\..\..\Externals\LZO\win32\$(ConfigurationName)"
-				GenerateDebugInformation="true"
+				IgnoreAllDefaultLibraries="false"
+				IgnoreDefaultLibraryNames="msvcprt msvcrt libcmt libcpmt"
+				GenerateDebugInformation="false"
 				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
-				GenerateMapFile="true"
+				GenerateMapFile="false"
 				MapFileName="$(TargetDir)linkermap.map"
 				SubSystem="2"
 				BaseAddress="0x00400000"
@@ -129,6 +131,7 @@
 				Name="VCPostBuildEventTool"
 				Description="Copying Data\* to $(TargetDir)"
 				CommandLine="xcopy &quot;$(SolutionDir)..\Data&quot; &quot;$(TargetDir)&quot; /s /e /q /d&#x0D;&#x0A;echo Copying External .dlls&#x0D;&#x0A;xcopy &quot;$(SolutionDir)..\Externals\Cg\*.dll&quot; &quot;$(TargetDir)&quot; /s /e /q /d&#x0D;&#x0A;xcopy &quot;$(SolutionDir)..\Externals\SDL\win32\*.dll&quot; &quot;$(TargetDir)&quot; /s /e /q /d&#x0D;&#x0A;xcopy &quot;$(SolutionDir)..\Externals\WiiUse\Win32\*.dll&quot; &quot;$(TargetDir)&quot; /s /e /q /d&#x0D;&#x0A;"
+				ExcludedFromBuild="false"
 			/>
 		</Configuration>
 		<Configuration
@@ -143,6 +146,7 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 				CommandLine="&quot;$(ProjectDir)..\Common\SubWCRev.exe&quot; &quot;$(SolutionDir)\.&quot; &quot;$(ProjectDir)..\Common\src\svnrev_template.h&quot; &quot;$(ProjectDir)..\Common\src\svnrev.h&quot;"
+				ExcludedFromBuild="true"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -255,6 +259,7 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 				CommandLine="&quot;$(ProjectDir)..\Common\SubWCRev.exe&quot; &quot;$(SolutionDir)\.&quot; &quot;$(ProjectDir)..\Common\src\svnrev_template.h&quot; &quot;$(ProjectDir)..\Common\src\svnrev.h&quot;"
+				ExcludedFromBuild="true"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -350,6 +355,7 @@
 				Name="VCPostBuildEventTool"
 				Description="Copying Data\* to $(TargetDir)"
 				CommandLine="xcopy &quot;$(SolutionDir)..\Data&quot; &quot;$(TargetDir)&quot; /s /e /q /d&#x0D;&#x0A;echo Copying External .dlls&#x0D;&#x0A;xcopy &quot;$(SolutionDir)..\Externals\Cg\*.dll&quot; &quot;$(TargetDir)&quot; /s /e /q /d&#x0D;&#x0A;xcopy &quot;$(SolutionDir)..\Externals\SDL\win32\*.dll&quot; &quot;$(TargetDir)&quot; /s /e /q /d&#x0D;&#x0A;xcopy &quot;$(SolutionDir)..\Externals\WiiUse\Win32\*.dll&quot; &quot;$(TargetDir)&quot; /s /e /q /d&#x0D;&#x0A;"
+				ExcludedFromBuild="true"
 			/>
 		</Configuration>
 		<Configuration
@@ -692,10 +698,18 @@
 		<Filter
 			Name="Resources"
 			>
+			<File
+				RelativePath="..\..\..\Installer\Dolphin.ico"
+				>
+			</File>
 			<File
 				RelativePath=".\resources\Dolphin.xpm"
 				>
 			</File>
+			<File
+				RelativePath=".\DolphinWX.rc"
+				>
+			</File>
 			<File
 				RelativePath=".\resources\Flag_Europe.xpm"
 				>
@@ -712,6 +726,10 @@
 				RelativePath=".\resources\Flag_USA.xpm"
 				>
 			</File>
+			<File
+				RelativePath=".\resource.h"
+				>
+			</File>
 			<File
 				RelativePath=".\resources\Toolbar_FileOpen.xpm"
 				>
@@ -913,14 +931,6 @@
 				>
 			</File>
 		</Filter>
-		<File
-			RelativePath="..\..\..\Installer\Dolphin.ico"
-			>
-		</File>
-		<File
-			RelativePath=".\DolphinWX.rc"
-			>
-		</File>
 		<File
 			RelativePath=".\src\main.cpp"
 			>
@@ -985,10 +995,6 @@
 			RelativePath="..\..\..\readme.txt"
 			>
 		</File>
-		<File
-			RelativePath=".\resource.h"
-			>
-		</File>
 		<File
 			RelativePath=".\Src\SConscript"
 			>