diff options
| author | Vadim Dashevskiy <watcherhd@gmail.com> | 2013-11-09 19:19:28 +0000 |
|---|---|---|
| committer | Vadim Dashevskiy <watcherhd@gmail.com> | 2013-11-09 19:19:28 +0000 |
| commit | 2dab65ca87cdccc4c7613be87a9015530ed33179 (patch) | |
| tree | a38485cca5786251fe2c1f52de415e6860fd7de1 | |
| parent | c1e506c14a86d4198b1fd3030f56dec46a8327d7 (diff) | |
compilation fixes
git-svn-id: http://svn.miranda-ng.org/main/trunk@6841 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
| -rw-r--r-- | plugins/AdvaImg/AdvaImg_12.vcxproj | 11 | ||||
| -rw-r--r-- | plugins/PluginUpdater/PluginUpdater_12.vcxproj | 10 | ||||
| -rw-r--r-- | protocols/JabberG/jabber_12.vcxproj | 3 | ||||
| -rw-r--r-- | protocols/MRA/Mra_12.vcxproj | 2 | ||||
| -rw-r--r-- | src/miranda32_12.vcxproj | 3 |
5 files changed, 13 insertions, 16 deletions
diff --git a/plugins/AdvaImg/AdvaImg_12.vcxproj b/plugins/AdvaImg/AdvaImg_12.vcxproj index 73b911797d..4b99ee23d3 100644 --- a/plugins/AdvaImg/AdvaImg_12.vcxproj +++ b/plugins/AdvaImg/AdvaImg_12.vcxproj @@ -182,12 +182,6 @@ </Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ProjectReference Include="..\zlib\zlib_11.vcxproj">
- <Project>{e2a369cd-eda3-414f-8ad0-e732cd7ee68c}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
<ClCompile Include="src\FreeImageToolkit\Background.cpp" />
<ClCompile Include="src\FreeImage\BitmapAccess.cpp" />
<ClCompile Include="src\FreeImage\ColorLookup.cpp" />
@@ -354,6 +348,11 @@ <ClInclude Include="src\FreeImageToolkit\Resize.h" />
<ClInclude Include="src\version.h" />
</ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\Zlib\zlib_12.vcxproj">
+ <Project>{e2a369cd-eda3-414f-8ad0-e732cd7ee68c}</Project>
+ </ProjectReference>
+ </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
diff --git a/plugins/PluginUpdater/PluginUpdater_12.vcxproj b/plugins/PluginUpdater/PluginUpdater_12.vcxproj index 563fb66921..80144a7a8e 100644 --- a/plugins/PluginUpdater/PluginUpdater_12.vcxproj +++ b/plugins/PluginUpdater/PluginUpdater_12.vcxproj @@ -201,16 +201,16 @@ <ClCompile Include="src\Utils.cpp" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\Zlib\zlib_11.vcxproj">
- <Project>{e2a369cd-eda3-414f-8ad0-e732cd7ee68c}</Project>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
<Image Include="res\btnClose.ico" />
<Image Include="res\btnOk.ico" />
<Image Include="res\info.ico" />
<Image Include="res\menu.ico" />
</ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\Zlib\zlib_12.vcxproj">
+ <Project>{e2a369cd-eda3-414f-8ad0-e732cd7ee68c}</Project>
+ </ProjectReference>
+ </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
diff --git a/protocols/JabberG/jabber_12.vcxproj b/protocols/JabberG/jabber_12.vcxproj index 04d18390f0..c7b089c20e 100644 --- a/protocols/JabberG/jabber_12.vcxproj +++ b/protocols/JabberG/jabber_12.vcxproj @@ -293,9 +293,8 @@ <ResourceCompile Include="res\version.rc" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\..\plugins\zlib\zlib_11.vcxproj">
+ <ProjectReference Include="..\..\plugins\Zlib\zlib_12.vcxproj">
<Project>{e2a369cd-eda3-414f-8ad0-e732cd7ee68c}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/protocols/MRA/Mra_12.vcxproj b/protocols/MRA/Mra_12.vcxproj index 28ddfa6c80..a7c1a022e4 100644 --- a/protocols/MRA/Mra_12.vcxproj +++ b/protocols/MRA/Mra_12.vcxproj @@ -248,7 +248,7 @@ <ResourceCompile Include="res\version.rc" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\..\plugins\Zlib\zlib_11.vcxproj">
+ <ProjectReference Include="..\..\plugins\Zlib\zlib_12.vcxproj">
<Project>{e2a369cd-eda3-414f-8ad0-e732cd7ee68c}</Project>
</ProjectReference>
</ItemGroup>
diff --git a/src/miranda32_12.vcxproj b/src/miranda32_12.vcxproj index 88cf196db4..87690ea6be 100644 --- a/src/miranda32_12.vcxproj +++ b/src/miranda32_12.vcxproj @@ -565,9 +565,8 @@ <ResourceCompile Include="version.rc" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\plugins\zlib\zlib_11.vcxproj">
+ <ProjectReference Include="..\plugins\Zlib\zlib_12.vcxproj">
<Project>{e2a369cd-eda3-414f-8ad0-e732cd7ee68c}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|