diff --git a/3rdparty/libjpeg/libjpeg.vcproj b/3rdparty/libjpeg/libjpeg.vcproj
index 50a8e7f3d5..8effd60b14 100644
--- a/3rdparty/libjpeg/libjpeg.vcproj
+++ b/3rdparty/libjpeg/libjpeg.vcproj
@@ -80,7 +80,7 @@
 			ConfigurationType="4"
 			InheritedPropertySheets="..\DefaultProjectRootDir.vsprops;..\3rdparty.vsprops;..\..\common\vsprops\CodeGen_Release.vsprops"
 			CharacterSet="1"
-			WholeProgramOptimization="1"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -102,6 +102,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				WholeProgramOptimization="false"
 				UsePrecompiledHeader="0"
 			/>
 			<Tool
diff --git a/3rdparty/portaudio/build/msvc/portaudio.vcproj b/3rdparty/portaudio/build/msvc/portaudio.vcproj
index 654025f7af..a9d86d3292 100644
--- a/3rdparty/portaudio/build/msvc/portaudio.vcproj
+++ b/3rdparty/portaudio/build/msvc/portaudio.vcproj
@@ -152,6 +152,7 @@
 			InheritedPropertySheets=".\ProjectRootDir.vsprops;..\..\..\3rdpartyDLL.vsprops;..\..\..\..\common\vsprops\CodeGen_Release.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
+			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
diff --git a/3rdparty/wxWidgets/build/msw/wx_adv_2008.vcproj b/3rdparty/wxWidgets/build/msw/wx_adv_2008.vcproj
index abfe390254..7177de7d20 100644
--- a/3rdparty/wxWidgets/build/msw/wx_adv_2008.vcproj
+++ b/3rdparty/wxWidgets/build/msw/wx_adv_2008.vcproj
@@ -5,6 +5,7 @@
 	Name="wxAdv28"
 	ProjectGUID="{0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E}"
 	RootNamespace="wxAdvanced"
+	TargetFrameworkVersion="0"
 	>
 	<Platforms>
 		<Platform
@@ -86,7 +87,7 @@
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="1"
-			WholeProgramOptimization="1"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -105,6 +106,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				WholeProgramOptimization="false"
 				AdditionalIncludeDirectories="&quot;$(ProjectRootDir)\include&quot;;&quot;$(ProjectRootDir)\include\msvc&quot;;&quot;$(SvnRootDir)\3rdparty\zlib&quot;"
 				PreprocessorDefinitions="wxUSE_BASE=0;wxUSE_GUI=1"
 				UsePrecompiledHeader="2"
@@ -385,11 +387,11 @@
 			Name="Setup Headers"
 			>
 			<File
-				RelativePath="..\..\include\wx\msw\setup.h"
+				RelativePath="..\..\include\wx\univ\setup.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\wx\univ\setup.h"
+				RelativePath="..\..\include\wx\msw\setup.h"
 				>
 			</File>
 		</Filter>
diff --git a/3rdparty/wxWidgets/build/msw/wx_core_2008.vcproj b/3rdparty/wxWidgets/build/msw/wx_core_2008.vcproj
index 548ed6d967..54998ea7c6 100644
--- a/3rdparty/wxWidgets/build/msw/wx_core_2008.vcproj
+++ b/3rdparty/wxWidgets/build/msw/wx_core_2008.vcproj
@@ -84,7 +84,7 @@
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="1"
-			WholeProgramOptimization="1"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -103,6 +103,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				WholeProgramOptimization="false"
 				AdditionalIncludeDirectories="&quot;$(ProjectRootDir)\include&quot;;&quot;$(ProjectRootDir)\include\msvc&quot;;&quot;$(SvnRootDir)\3rdparty\zlib&quot;;&quot;$(ProjectRootDir)\src\png&quot;;&quot;$(SvnRootDir)\3rdparty\libjpeg&quot;"
 				PreprocessorDefinitions="wxUSE_BASE=0;wxUSE_GUI=1"
 				UsePrecompiledHeader="2"
diff --git a/3rdparty/zlib/zlib.vcproj b/3rdparty/zlib/zlib.vcproj
index cbe69e2bf0..20f27d87fa 100644
--- a/3rdparty/zlib/zlib.vcproj
+++ b/3rdparty/zlib/zlib.vcproj
@@ -75,7 +75,7 @@
 			InheritedPropertySheets="..\DefaultProjectRootDir.vsprops;..\3rdparty.vsprops;..\..\common\vsprops\CodeGen_Release.vsprops"
 			UseOfMFC="1"
 			CharacterSet="2"
-			WholeProgramOptimization="1"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -94,6 +94,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				WholeProgramOptimization="false"
 				PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS"
 				WarningLevel="3"
 			/>
diff --git a/common/build/x86emitter/x86emitter.vcproj b/common/build/x86emitter/x86emitter.vcproj
index 8ffeef3f14..df3f89d807 100644
--- a/common/build/x86emitter/x86emitter.vcproj
+++ b/common/build/x86emitter/x86emitter.vcproj
@@ -77,7 +77,7 @@
 			ConfigurationType="4"
 			InheritedPropertySheets="..\..\vsprops\CommonLibrary.vsprops;..\..\vsprops\CodeGen_Release.vsprops;..\..\vsprops\pthreads.vsprops"
 			CharacterSet="1"
-			WholeProgramOptimization="1"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -98,6 +98,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
+				WholeProgramOptimization="false"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="PrecompiledHeader.h"