From 73142bb2f24f6e71a167d6785036b7456f65a2af Mon Sep 17 00:00:00 2001
From: gigaherz <gigaherz@96395faa-99c1-11dd-bbfe-3dabce05a288>
Date: Wed, 14 Apr 2010 21:59:18 +0000
Subject: [PATCH] Apparently ZeroSPU2 has a 3-folder structure like the null
 plugins, instead of 4-folder like the rest, so make it use the other .props,
 so that it can be compiled. Somehow there's a pair of files in wxcore that
 won't build correctly, even tho they did build before... and it seems to work
 fine if I turn them off, so i did.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2851 96395faa-99c1-11dd-bbfe-3dabce05a288
---
 3rdparty/wxWidgets/build/msw/wx_core.vcxproj | 12 ++++++++++--
 plugins/zerospu2/Windows/ZeroSPU2.vcxproj    |  6 +++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/3rdparty/wxWidgets/build/msw/wx_core.vcxproj b/3rdparty/wxWidgets/build/msw/wx_core.vcxproj
index 7106db8774..9b696ecb91 100644
--- a/3rdparty/wxWidgets/build/msw/wx_core.vcxproj
+++ b/3rdparty/wxWidgets/build/msw/wx_core.vcxproj
@@ -325,7 +325,11 @@
     <ClCompile Include="..\..\src\msw\volume.cpp" />
     <ClCompile Include="..\..\src\msw\window.cpp" />
     <ClCompile Include="..\..\src\generic\aboutdlgg.cpp" />
-    <ClCompile Include="..\..\src\generic\accel.cpp" />
+    <ClCompile Include="..\..\src\generic\accel.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Devel|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\src\generic\busyinfo.cpp" />
     <ClCompile Include="..\..\src\generic\buttonbar.cpp" />
     <ClCompile Include="..\..\src\generic\choicbkg.cpp" />
@@ -345,7 +349,11 @@
     <ClCompile Include="..\..\src\generic\fontpickerg.cpp" />
     <ClCompile Include="..\..\src\generic\hyperlink.cpp" />
     <ClCompile Include="..\..\src\generic\listbkg.cpp" />
-    <ClCompile Include="..\..\src\generic\listctrl.cpp" />
+    <ClCompile Include="..\..\src\generic\listctrl.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Devel|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\src\generic\logg.cpp" />
     <ClCompile Include="..\..\src\generic\mdig.cpp" />
     <ClCompile Include="..\..\src\generic\msgdlgg.cpp">
diff --git a/plugins/zerospu2/Windows/ZeroSPU2.vcxproj b/plugins/zerospu2/Windows/ZeroSPU2.vcxproj
index 099466ef7c..069dd117fe 100644
--- a/plugins/zerospu2/Windows/ZeroSPU2.vcxproj
+++ b/plugins/zerospu2/Windows/ZeroSPU2.vcxproj
@@ -40,7 +40,7 @@
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Devel|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\common\vsprops\plugin_svnroot.props" />
+    <Import Project="..\..\..\common\vsprops\nullplugin_svnroot.props" />
     <Import Project="ProjectRootDir.props" />
     <Import Project="..\..\..\common\vsprops\BaseProperties.props" />
     <Import Project="..\..\..\common\vsprops\3rdpartyDeps.props" />
@@ -49,7 +49,7 @@
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\common\vsprops\plugin_svnroot.props" />
+    <Import Project="..\..\..\common\vsprops\nullplugin_svnroot.props" />
     <Import Project="ProjectRootDir.props" />
     <Import Project="..\..\..\common\vsprops\BaseProperties.props" />
     <Import Project="..\..\..\common\vsprops\3rdpartyDeps.props" />
@@ -57,7 +57,7 @@
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\common\vsprops\plugin_svnroot.props" />
+    <Import Project="..\..\..\common\vsprops\nullplugin_svnroot.props" />
     <Import Project="ProjectRootDir.props" />
     <Import Project="..\..\..\common\vsprops\BaseProperties.props" />
     <Import Project="..\..\..\common\vsprops\3rdpartyDeps.props" />