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

wxWidgets3.0: Always include correct manifest 

If pcsx2 is compiled for 32-bits and then compiled for 64-bits without
cleaning the build files, the wrong wx3.0 manifest will be included. The
same will happen vice versa.

Place the generated rcdefs.h file in a platform specific directory so
the correct manifest will always be used.
This commit is contained in:
Jonathan Li 2015-07-25 15:39:52 +01:00
parent 8879866b32
commit f5f3bc4e60
4 changed files with 58 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
3rdparty/wxwidgets3.0/build/msw/wx30_config_vs2012.vcxproj vendored
View File

@ -130,30 +130,30 @@
<Outputs Condition="'$(Configuration)|$(Platform)'=='Devel|x64'">..\..\include\wx\setup.h;%(Outputs)</Outputs>
</CustomBuild>
<CustomBuild Include="..\..\include\wx\msw\genrcdefs.h">
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Creating ..\..\include\wx\msw\rcdefs.h</Message>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Creating ..\..\include\wx\msw\rcdefs.h</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cl /EP /nologo "%(Identity)" &gt; "..\..\include\wx\msw\rcdefs.h"</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">cl /EP /nologo "%(Identity)" &gt; "..\..\include\wx\msw\rcdefs.h"</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\include\wx\msw\rcdefs.h;%(Outputs)</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\include\wx\msw\rcdefs.h;%(Outputs)</Outputs>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\include\wx\msw;%(AdditionalInputs)</AdditionalInputs>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\include\wx\msw;%(AdditionalInputs)</AdditionalInputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Creating ..\..\include\wx\msw\rcdefs.h</Message>
<Message Condition="'$(Configuration)|$(Platform)'=='Devel|Win32'">Creating ..\..\include\wx\msw\rcdefs.h</Message>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Creating ..\..\include\wx\msw\rcdefs.h</Message>
<Message Condition="'$(Configuration)|$(Platform)'=='Devel|x64'">Creating ..\..\include\wx\msw\rcdefs.h</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cl /EP /nologo "%(Identity)" &gt; "..\..\include\wx\msw\rcdefs.h"</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Devel|Win32'">cl /EP /nologo "%(Identity)" &gt; "..\..\include\wx\msw\rcdefs.h"</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">cl /EP /nologo "%(Identity)" &gt; "..\..\include\wx\msw\rcdefs.h"</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Devel|x64'">cl /EP /nologo "%(Identity)" &gt; "..\..\include\wx\msw\rcdefs.h"</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\include\wx\msw\rcdefs.h;%(Outputs)</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Devel|Win32'">..\..\include\wx\msw\rcdefs.h;%(Outputs)</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\include\wx\msw\rcdefs.h;%(Outputs)</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Devel|x64'">..\..\include\wx\msw\rcdefs.h;%(Outputs)</Outputs>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\include\wx\msw;%(AdditionalInputs)</AdditionalInputs>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Devel|Win32'">..\..\include\wx\msw;%(AdditionalInputs)</AdditionalInputs>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\include\wx\msw;%(AdditionalInputs)</AdditionalInputs>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Devel|x64'">..\..\include\wx\msw;%(AdditionalInputs)</AdditionalInputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Creating ..\..\$(PlatformName)\wx\msw\rcdefs.h</Message>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Creating ..\..\$(PlatformName)\wx\msw\rcdefs.h</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cl /EP /nologo "%(Identity)" &gt; "..\..\$(PlatformName)\wx\msw\rcdefs.h"</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">cl /EP /nologo "%(Identity)" &gt; "..\..\$(PlatformName)\wx\msw\rcdefs.h"</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\$(PlatformName)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\$(PlatformName)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\$(PlatformName)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\$(PlatformName)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Creating ..\..\$(PlatformName)\wx\msw\rcdefs.h</Message>
<Message Condition="'$(Configuration)|$(Platform)'=='Devel|Win32'">Creating ..\..\$(PlatformName)\wx\msw\rcdefs.h</Message>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Creating ..\..\$(PlatformName)\wx\msw\rcdefs.h</Message>
<Message Condition="'$(Configuration)|$(Platform)'=='Devel|x64'">Creating ..\..\$(PlatformName)\wx\msw\rcdefs.h</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cl /EP /nologo "%(Identity)" &gt; "..\..\$(PlatformName)\wx\msw\rcdefs.h"</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Devel|Win32'">cl /EP /nologo "%(Identity)" &gt; "..\..\$(PlatformName)\wx\msw\rcdefs.h"</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">cl /EP /nologo "%(Identity)" &gt; "..\..\$(PlatformName)\wx\msw\rcdefs.h"</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Devel|x64'">cl /EP /nologo "%(Identity)" &gt; "..\..\$(PlatformName)\wx\msw\rcdefs.h"</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\$(PlatformName)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Devel|Win32'">..\..\$(PlatformName)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\$(PlatformName)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Devel|x64'">..\..\$(PlatformName)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\$(PlatformName)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Devel|Win32'">..\..\$(PlatformName)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\$(PlatformName)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Devel|x64'">..\..\$(PlatformName)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
</CustomBuild>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

48
3rdparty/wxwidgets3.0/build/msw/wx30_config_vs2013.vcxproj vendored
View File

@ -130,30 +130,30 @@
<Outputs Condition="'$(Configuration)|$(Platform)'=='Devel|x64'">..\..\include\wx\setup.h;%(Outputs)</Outputs>
</CustomBuild>
<CustomBuild Include="..\..\include\wx\msw\genrcdefs.h">
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Creating ..\..\include\wx\msw\rcdefs.h</Message>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Creating ..\..\include\wx\msw\rcdefs.h</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cl /EP /nologo "%(Identity)" &gt; "..\..\include\wx\msw\rcdefs.h"</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">cl /EP /nologo "%(Identity)" &gt; "..\..\include\wx\msw\rcdefs.h"</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\include\wx\msw\rcdefs.h;%(Outputs)</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\include\wx\msw\rcdefs.h;%(Outputs)</Outputs>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\include\wx\msw;%(AdditionalInputs)</AdditionalInputs>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\include\wx\msw;%(AdditionalInputs)</AdditionalInputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Creating ..\..\include\wx\msw\rcdefs.h</Message>
<Message Condition="'$(Configuration)|$(Platform)'=='Devel|Win32'">Creating ..\..\include\wx\msw\rcdefs.h</Message>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Creating ..\..\include\wx\msw\rcdefs.h</Message>
<Message Condition="'$(Configuration)|$(Platform)'=='Devel|x64'">Creating ..\..\include\wx\msw\rcdefs.h</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cl /EP /nologo "%(Identity)" &gt; "..\..\include\wx\msw\rcdefs.h"</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Devel|Win32'">cl /EP /nologo "%(Identity)" &gt; "..\..\include\wx\msw\rcdefs.h"</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">cl /EP /nologo "%(Identity)" &gt; "..\..\include\wx\msw\rcdefs.h"</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Devel|x64'">cl /EP /nologo "%(Identity)" &gt; "..\..\include\wx\msw\rcdefs.h"</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\include\wx\msw\rcdefs.h;%(Outputs)</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Devel|Win32'">..\..\include\wx\msw\rcdefs.h;%(Outputs)</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\include\wx\msw\rcdefs.h;%(Outputs)</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Devel|x64'">..\..\include\wx\msw\rcdefs.h;%(Outputs)</Outputs>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\include\wx\msw;%(AdditionalInputs)</AdditionalInputs>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Devel|Win32'">..\..\include\wx\msw;%(AdditionalInputs)</AdditionalInputs>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\include\wx\msw;%(AdditionalInputs)</AdditionalInputs>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Devel|x64'">..\..\include\wx\msw;%(AdditionalInputs="")</AdditionalInputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Creating ..\..\$(PlatformName)\wx\msw\rcdefs.h</Message>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Creating ..\..\$(PlatformName)\wx\msw\rcdefs.h</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cl /EP /nologo "%(Identity)" &gt; "..\..\$(PlatformName)\wx\msw\rcdefs.h"</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">cl /EP /nologo "%(Identity)" &gt; "..\..\$(PlatformName)\wx\msw\rcdefs.h"</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\$(PlatformName)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\$(PlatformName)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\$(PlatformName)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\$(PlatformName)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Creating ..\..\$(PlatformName)\wx\msw\rcdefs.h</Message>
<Message Condition="'$(Configuration)|$(Platform)'=='Devel|Win32'">Creating ..\..\$(PlatformName)\wx\msw\rcdefs.h</Message>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Creating ..\..\$(PlatformName)\wx\msw\rcdefs.h</Message>
<Message Condition="'$(Configuration)|$(Platform)'=='Devel|x64'">Creating ..\..\$(PlatformName)\wx\msw\rcdefs.h</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cl /EP /nologo "%(Identity)" &gt; "..\..\$(PlatformName)\wx\msw\rcdefs.h"</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Devel|Win32'">cl /EP /nologo "%(Identity)" &gt; "..\..\$(PlatformName)\wx\msw\rcdefs.h"</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">cl /EP /nologo "%(Identity)" &gt; "..\..\$(PlatformName)\wx\msw\rcdefs.h"</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Devel|x64'">cl /EP /nologo "%(Identity)" &gt; "..\..\$(PlatformName)\wx\msw\rcdefs.h"</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\$(PlatformName)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Devel|Win32'">..\..\$(PlatformName)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\$(PlatformName)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Devel|x64'">..\..\$(PlatformName)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\$(PlatformName)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Devel|Win32'">..\..\$(PlatformName)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\$(PlatformName)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Devel|x64'">..\..\$(PlatformName)\wx\msw;%(AdditionalInputs="")</AdditionalInputs>
</CustomBuild>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

6
pcsx2/windows/VCprojects/pcsx2_vs2012.vcxproj
View File

@ -883,7 +883,11 @@
<ClInclude Include="..\..\ZipTools\ThreadedZipTools.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\..\..\3rdparty\wxwidgets3.0\include\wx\msw\wx.rc" />
<ResourceCompile Include="..\..\..\3rdparty\wxwidgets3.0\include\wx\msw\wx.rc">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\3rdparty\wxwidgets3.0\$(PlatformName);$(SolutionDir)\3rdparty\wxwidgets3.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Devel|Win32'">$(SolutionDir)\3rdparty\wxwidgets3.0\$(PlatformName);$(SolutionDir)\3rdparty\wxwidgets3.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\3rdparty\wxwidgets3.0\$(PlatformName);$(SolutionDir)\3rdparty\wxwidgets3.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<ResourceCompile Include="..\wxResources.rc" />
</ItemGroup>
<ItemGroup>

6
pcsx2/windows/VCprojects/pcsx2_vs2013.vcxproj
View File

@ -883,7 +883,11 @@
<ClInclude Include="..\..\ZipTools\ThreadedZipTools.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\..\..\3rdparty\wxwidgets3.0\include\wx\msw\wx.rc" />
<ResourceCompile Include="..\..\..\3rdparty\wxwidgets3.0\include\wx\msw\wx.rc">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\3rdparty\wxwidgets3.0\$(PlatformName);$(SolutionDir)\3rdparty\wxwidgets3.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Devel|Win32'">$(SolutionDir)\3rdparty\wxwidgets3.0\$(PlatformName);$(SolutionDir)\3rdparty\wxwidgets3.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\3rdparty\wxwidgets3.0\$(PlatformName);$(SolutionDir)\3rdparty\wxwidgets3.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<ResourceCompile Include="..\wxResources.rc" />
</ItemGroup>
<ItemGroup>