ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
gigaherz 2010-04-14 21:59:18 +00:00
parent b622a3c9a3
commit 73142bb2f2
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
3rdparty/wxWidgets/build/msw/wx_core.vcxproj vendored
View File

@ -325,7 +325,11 @@
<ClCompile Include="..\..\src\msw\volume.cpp" /> <ClCompile Include="..\..\src\msw\volume.cpp" />
<ClCompile Include="..\..\src\msw\window.cpp" /> <ClCompile Include="..\..\src\msw\window.cpp" />
<ClCompile Include="..\..\src\generic\aboutdlgg.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\busyinfo.cpp" />
<ClCompile Include="..\..\src\generic\buttonbar.cpp" /> <ClCompile Include="..\..\src\generic\buttonbar.cpp" />
<ClCompile Include="..\..\src\generic\choicbkg.cpp" /> <ClCompile Include="..\..\src\generic\choicbkg.cpp" />
@ -345,7 +349,11 @@
<ClCompile Include="..\..\src\generic\fontpickerg.cpp" /> <ClCompile Include="..\..\src\generic\fontpickerg.cpp" />
<ClCompile Include="..\..\src\generic\hyperlink.cpp" /> <ClCompile Include="..\..\src\generic\hyperlink.cpp" />
<ClCompile Include="..\..\src\generic\listbkg.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\logg.cpp" />
<ClCompile Include="..\..\src\generic\mdig.cpp" /> <ClCompile Include="..\..\src\generic\mdig.cpp" />
<ClCompile Include="..\..\src\generic\msgdlgg.cpp"> <ClCompile Include="..\..\src\generic\msgdlgg.cpp">

6
plugins/zerospu2/Windows/ZeroSPU2.vcxproj
View File

@ -40,7 +40,7 @@
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Devel|Win32'" Label="PropertySheets"> <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="$(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="ProjectRootDir.props" />
<Import Project="..\..\..\common\vsprops\BaseProperties.props" /> <Import Project="..\..\..\common\vsprops\BaseProperties.props" />
<Import Project="..\..\..\common\vsprops\3rdpartyDeps.props" /> <Import Project="..\..\..\common\vsprops\3rdpartyDeps.props" />
@ -49,7 +49,7 @@
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> <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="$(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="ProjectRootDir.props" />
<Import Project="..\..\..\common\vsprops\BaseProperties.props" /> <Import Project="..\..\..\common\vsprops\BaseProperties.props" />
<Import Project="..\..\..\common\vsprops\3rdpartyDeps.props" /> <Import Project="..\..\..\common\vsprops\3rdpartyDeps.props" />
@ -57,7 +57,7 @@
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> <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="$(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="ProjectRootDir.props" />
<Import Project="..\..\..\common\vsprops\BaseProperties.props" /> <Import Project="..\..\..\common\vsprops\BaseProperties.props" />
<Import Project="..\..\..\common\vsprops\3rdpartyDeps.props" /> <Import Project="..\..\..\common\vsprops\3rdpartyDeps.props" />