diff options
| author | Szymon Tokarz <wsx22@o2.pl> | 2013-11-13 22:02:05 +0000 |
|---|---|---|
| committer | Szymon Tokarz <wsx22@o2.pl> | 2013-11-13 22:02:05 +0000 |
| commit | 58405c8f8372ad783692794b386ca2446757f546 (patch) | |
| tree | 30718f4108300be40021080dac9c6bdb8bef3303 /plugins/MirFox/MirFoxNG_12.vcxproj | |
| parent | 7c94d896eb5b28158460c163377b4c570143c839 (diff) | |
MirFox
- vc2013 compilation fix (different MirFoxCommons libs sets for vc2010 (v100) and vc2013 (v120) compilers)
git-svn-id: http://svn.miranda-ng.org/main/trunk@6896 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/MirFox/MirFoxNG_12.vcxproj')
| -rw-r--r-- | plugins/MirFox/MirFoxNG_12.vcxproj | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/plugins/MirFox/MirFoxNG_12.vcxproj b/plugins/MirFox/MirFoxNG_12.vcxproj index 3d04f66d38..9bcab47fb0 100644 --- a/plugins/MirFox/MirFoxNG_12.vcxproj +++ b/plugins/MirFox/MirFoxNG_12.vcxproj @@ -99,7 +99,7 @@ <Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>$(ProfileDir)..\..\bin12\lib</AdditionalLibraryDirectories>
- <AdditionalDependencies>src\lib\MirFoxCommonsDebug32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>src\lib\$(PlatformToolset)\MirFoxCommons$(Configuration)$(PlatformArchitecture).lib;%(AdditionalDependencies)</AdditionalDependencies>
<SubSystem>Windows</SubSystem>
<ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
@@ -122,7 +122,7 @@ <Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>$(ProfileDir)..\..\bin12\lib</AdditionalLibraryDirectories>
- <AdditionalDependencies>src\lib\MirFoxCommonsDebug64.lib;mir_core64.lib;Miranda64.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>src\lib\$(PlatformToolset)\MirFoxCommons$(Configuration)$(PlatformArchitecture).lib;mir_core64.lib;Miranda64.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SubSystem>Windows</SubSystem>
<ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
</Link>
@@ -150,7 +150,7 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalLibraryDirectories>$(ProfileDir)..\..\bin12\lib</AdditionalLibraryDirectories>
- <AdditionalDependencies>src\lib\MirFoxCommonsRelease32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>src\lib\$(PlatformToolset)\MirFoxCommons$(Configuration)$(PlatformArchitecture).lib;%(AdditionalDependencies)</AdditionalDependencies>
<SubSystem>Windows</SubSystem>
<ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
</Link>
@@ -177,7 +177,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
- <AdditionalDependencies>src\lib\MirFoxCommonsRelease64.lib;mir_core64.lib;Miranda64.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>src\lib\$(PlatformToolset)\MirFoxCommons$(Configuration)$(PlatformArchitecture).lib;mir_core64.lib;Miranda64.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SubSystem>Windows</SubSystem>
<ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
<AdditionalLibraryDirectories>$(ProfileDir)..\..\bin12\lib</AdditionalLibraryDirectories>
@@ -190,6 +190,8 @@ <ItemGroup>
<None Include="res\option_off.ico" />
<None Include="res\option_showinff.ico" />
+ <None Include="res\popup_error.ico" />
+ <None Include="res\popup_notify.ico" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="res\resource.rc">
|