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

Remove wxWidgets linker dependencies in property sheet 

The wxWidgets projects have already been specified as references for
both the SPU2-X and pcsx2 project, so there is no need to also specify
the static libraries as additional linker dependencies.
This commit is contained in:
Jonathan Li 2015-06-12 18:17:30 +01:00
parent 283d4fa57c
commit fbf71218f1
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
common/vsprops/wxWidgetsGui.props
View File

@ -10,22 +10,16 @@
<PreprocessorDefinitions>wxUSE_UNICODE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>wxUSE_UNICODE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling> <ExceptionHandling>Async</ExceptionHandling>
</ClCompile> </ClCompile>
<Link Condition="'$(Configuration)'=='Release' <Link Condition="'$(Configuration)'=='Release' &#xD;&#xA; or '$(Configuration)'=='Release SSE2'&#xD;&#xA; or '$(Configuration)'=='Release SSE4'&#xD;&#xA; or '$(Configuration)'=='Release SSSE3'">
or '$(Configuration)'=='Release SSE2' <AdditionalDependencies>zlib.lib;libjpeg7.lib;%(AdditionalDependencies)</AdditionalDependencies>
or '$(Configuration)'=='Release SSE4'
or '$(Configuration)'=='Release SSSE3'">
<AdditionalDependencies>wxAdv28.lib;wxBase28.lib;wxCore28.lib;zlib.lib;libjpeg7.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SvnRootDir)\deps\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>$(SvnRootDir)\deps\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link> </Link>
<Link Condition="'$(Configuration)'=='Debug' <Link Condition="'$(Configuration)'=='Debug' &#xD;&#xA; or '$(Configuration)'=='Debug SSE2'&#xD;&#xA; or '$(Configuration)'=='Debug SSE4'&#xD;&#xA; or '$(Configuration)'=='Debug SSSE3'">
or '$(Configuration)'=='Debug SSE2' <AdditionalDependencies>zlib-dbg.lib;libjpeg7-dbg.lib;%(AdditionalDependencies)</AdditionalDependencies>
or '$(Configuration)'=='Debug SSE4'
or '$(Configuration)'=='Debug SSSE3'">
<AdditionalDependencies>wxAdv28-dbg.lib;wxBase28-dbg.lib;wxCore28-dbg.lib;zlib-dbg.lib;libjpeg7-dbg.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SvnRootDir)\deps\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>$(SvnRootDir)\deps\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link> </Link>
<Link Condition="'$(Configuration)'=='Devel'"> <Link Condition="'$(Configuration)'=='Devel'">
<AdditionalDependencies>wxAdv28-dev.lib;wxBase28-dev.lib;wxCore28-dev.lib;zlib-dev.lib;libjpeg7-dev.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>zlib-dev.lib;libjpeg7-dev.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SvnRootDir)\deps\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>$(SvnRootDir)\deps\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>