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 | |
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')
24 files changed, 36 insertions, 12 deletions
diff --git a/plugins/MirFox/MirFoxNG_10.vcxproj b/plugins/MirFox/MirFoxNG_10.vcxproj index b457202aaa..f919635c9c 100644 --- a/plugins/MirFox/MirFoxNG_10.vcxproj +++ b/plugins/MirFox/MirFoxNG_10.vcxproj @@ -95,7 +95,7 @@ <Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\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>
</Link>
@@ -117,7 +117,7 @@ <Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\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>
@@ -145,7 +145,7 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\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>
<AdditionalOptions>/PDBALTPATH:%_PDB% %(AdditionalOptions)</AdditionalOptions>
@@ -173,7 +173,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)..\..\bin10\lib</AdditionalLibraryDirectories>
@@ -187,6 +187,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">
diff --git a/plugins/MirFox/MirFoxNG_10.vcxproj.filters b/plugins/MirFox/MirFoxNG_10.vcxproj.filters index 40928d5016..b1e0f7e43d 100644 --- a/plugins/MirFox/MirFoxNG_10.vcxproj.filters +++ b/plugins/MirFox/MirFoxNG_10.vcxproj.filters @@ -21,6 +21,12 @@ <None Include="res\option_showinff.ico">
<Filter>Resource Files</Filter>
</None>
+ <None Include="res\popup_error.ico">
+ <Filter>Resource Files</Filter>
+ </None>
+ <None Include="res\popup_notify.ico">
+ <Filter>Resource Files</Filter>
+ </None>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="res\resource.rc">
diff --git a/plugins/MirFox/MirFoxNG_11.vcxproj b/plugins/MirFox/MirFoxNG_11.vcxproj index e1ed81c21b..03e65d5e99 100644 --- a/plugins/MirFox/MirFoxNG_11.vcxproj +++ b/plugins/MirFox/MirFoxNG_11.vcxproj @@ -99,7 +99,7 @@ <Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>$(ProfileDir)..\..\bin11\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)..\..\bin11\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)..\..\bin11\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)..\..\bin11\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">
diff --git a/plugins/MirFox/MirFoxNG_11.vcxproj.filters b/plugins/MirFox/MirFoxNG_11.vcxproj.filters index 40928d5016..b1e0f7e43d 100644 --- a/plugins/MirFox/MirFoxNG_11.vcxproj.filters +++ b/plugins/MirFox/MirFoxNG_11.vcxproj.filters @@ -21,6 +21,12 @@ <None Include="res\option_showinff.ico">
<Filter>Resource Files</Filter>
</None>
+ <None Include="res\popup_error.ico">
+ <Filter>Resource Files</Filter>
+ </None>
+ <None Include="res\popup_notify.ico">
+ <Filter>Resource Files</Filter>
+ </None>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="res\resource.rc">
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">
diff --git a/plugins/MirFox/MirFoxNG_12.vcxproj.filters b/plugins/MirFox/MirFoxNG_12.vcxproj.filters index 40928d5016..b1e0f7e43d 100644 --- a/plugins/MirFox/MirFoxNG_12.vcxproj.filters +++ b/plugins/MirFox/MirFoxNG_12.vcxproj.filters @@ -21,6 +21,12 @@ <None Include="res\option_showinff.ico">
<Filter>Resource Files</Filter>
</None>
+ <None Include="res\popup_error.ico">
+ <Filter>Resource Files</Filter>
+ </None>
+ <None Include="res\popup_notify.ico">
+ <Filter>Resource Files</Filter>
+ </None>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="res\resource.rc">
diff --git a/plugins/MirFox/src/lib/MirFoxCommonsRelease32.lib b/plugins/MirFox/src/lib/MirFoxCommonsRelease32.lib Binary files differdeleted file mode 100644 index 46b3185bff..0000000000 --- a/plugins/MirFox/src/lib/MirFoxCommonsRelease32.lib +++ /dev/null diff --git a/plugins/MirFox/src/lib/MirFoxCommonsRelease64.lib b/plugins/MirFox/src/lib/MirFoxCommonsRelease64.lib Binary files differdeleted file mode 100644 index c0f3f89d7f..0000000000 --- a/plugins/MirFox/src/lib/MirFoxCommonsRelease64.lib +++ /dev/null diff --git a/plugins/MirFox/src/lib/MirFoxCommonsDebug32.lib b/plugins/MirFox/src/lib/v100/MirFoxCommonsDebug32.lib Binary files differindex baf2b0447c..d6f6dd97a9 100644 --- a/plugins/MirFox/src/lib/MirFoxCommonsDebug32.lib +++ b/plugins/MirFox/src/lib/v100/MirFoxCommonsDebug32.lib diff --git a/plugins/MirFox/src/lib/MirFoxCommonsDebug32.pdb b/plugins/MirFox/src/lib/v100/MirFoxCommonsDebug32.pdb Binary files differindex c14655686d..c252ddafdf 100644 --- a/plugins/MirFox/src/lib/MirFoxCommonsDebug32.pdb +++ b/plugins/MirFox/src/lib/v100/MirFoxCommonsDebug32.pdb diff --git a/plugins/MirFox/src/lib/MirFoxCommonsDebug64.lib b/plugins/MirFox/src/lib/v100/MirFoxCommonsDebug64.lib Binary files differindex 94a950db06..e7902026c5 100644 --- a/plugins/MirFox/src/lib/MirFoxCommonsDebug64.lib +++ b/plugins/MirFox/src/lib/v100/MirFoxCommonsDebug64.lib diff --git a/plugins/MirFox/src/lib/MirFoxCommonsDebug64.pdb b/plugins/MirFox/src/lib/v100/MirFoxCommonsDebug64.pdb Binary files differindex f548a1a86f..70860883bc 100644 --- a/plugins/MirFox/src/lib/MirFoxCommonsDebug64.pdb +++ b/plugins/MirFox/src/lib/v100/MirFoxCommonsDebug64.pdb diff --git a/plugins/MirFox/src/lib/v100/MirFoxCommonsRelease32.lib b/plugins/MirFox/src/lib/v100/MirFoxCommonsRelease32.lib Binary files differnew file mode 100644 index 0000000000..67d3893765 --- /dev/null +++ b/plugins/MirFox/src/lib/v100/MirFoxCommonsRelease32.lib diff --git a/plugins/MirFox/src/lib/MirFoxCommonsRelease32.pdb b/plugins/MirFox/src/lib/v100/MirFoxCommonsRelease32.pdb Binary files differindex 6cfc177341..018e8dbae0 100644 --- a/plugins/MirFox/src/lib/MirFoxCommonsRelease32.pdb +++ b/plugins/MirFox/src/lib/v100/MirFoxCommonsRelease32.pdb diff --git a/plugins/MirFox/src/lib/v100/MirFoxCommonsRelease64.lib b/plugins/MirFox/src/lib/v100/MirFoxCommonsRelease64.lib Binary files differnew file mode 100644 index 0000000000..4491d61a93 --- /dev/null +++ b/plugins/MirFox/src/lib/v100/MirFoxCommonsRelease64.lib diff --git a/plugins/MirFox/src/lib/MirFoxCommonsRelease64.pdb b/plugins/MirFox/src/lib/v100/MirFoxCommonsRelease64.pdb Binary files differindex e45191307e..cf6c0ea9b6 100644 --- a/plugins/MirFox/src/lib/MirFoxCommonsRelease64.pdb +++ b/plugins/MirFox/src/lib/v100/MirFoxCommonsRelease64.pdb diff --git a/plugins/MirFox/src/lib/v120_xp/MirFoxCommonsDebug32.lib b/plugins/MirFox/src/lib/v120_xp/MirFoxCommonsDebug32.lib Binary files differnew file mode 100644 index 0000000000..fd22a9fc05 --- /dev/null +++ b/plugins/MirFox/src/lib/v120_xp/MirFoxCommonsDebug32.lib diff --git a/plugins/MirFox/src/lib/v120_xp/MirFoxCommonsDebug32.pdb b/plugins/MirFox/src/lib/v120_xp/MirFoxCommonsDebug32.pdb Binary files differnew file mode 100644 index 0000000000..c1a092fec9 --- /dev/null +++ b/plugins/MirFox/src/lib/v120_xp/MirFoxCommonsDebug32.pdb diff --git a/plugins/MirFox/src/lib/v120_xp/MirFoxCommonsDebug64.lib b/plugins/MirFox/src/lib/v120_xp/MirFoxCommonsDebug64.lib Binary files differnew file mode 100644 index 0000000000..6eaca61130 --- /dev/null +++ b/plugins/MirFox/src/lib/v120_xp/MirFoxCommonsDebug64.lib diff --git a/plugins/MirFox/src/lib/v120_xp/MirFoxCommonsDebug64.pdb b/plugins/MirFox/src/lib/v120_xp/MirFoxCommonsDebug64.pdb Binary files differnew file mode 100644 index 0000000000..a2e938f52a --- /dev/null +++ b/plugins/MirFox/src/lib/v120_xp/MirFoxCommonsDebug64.pdb diff --git a/plugins/MirFox/src/lib/v120_xp/MirFoxCommonsRelease32.lib b/plugins/MirFox/src/lib/v120_xp/MirFoxCommonsRelease32.lib Binary files differnew file mode 100644 index 0000000000..c221092f1f --- /dev/null +++ b/plugins/MirFox/src/lib/v120_xp/MirFoxCommonsRelease32.lib diff --git a/plugins/MirFox/src/lib/v120_xp/MirFoxCommonsRelease32.pdb b/plugins/MirFox/src/lib/v120_xp/MirFoxCommonsRelease32.pdb Binary files differnew file mode 100644 index 0000000000..679ded1af1 --- /dev/null +++ b/plugins/MirFox/src/lib/v120_xp/MirFoxCommonsRelease32.pdb diff --git a/plugins/MirFox/src/lib/v120_xp/MirFoxCommonsRelease64.lib b/plugins/MirFox/src/lib/v120_xp/MirFoxCommonsRelease64.lib Binary files differnew file mode 100644 index 0000000000..5b3ddfc1e7 --- /dev/null +++ b/plugins/MirFox/src/lib/v120_xp/MirFoxCommonsRelease64.lib diff --git a/plugins/MirFox/src/lib/v120_xp/MirFoxCommonsRelease64.pdb b/plugins/MirFox/src/lib/v120_xp/MirFoxCommonsRelease64.pdb Binary files differnew file mode 100644 index 0000000000..cd43b451e0 --- /dev/null +++ b/plugins/MirFox/src/lib/v120_xp/MirFoxCommonsRelease64.pdb |