Not delaying mir_core.dll load when not needed

git-svn-id: http://svn.miranda-ng.org/main/trunk@6020 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

3 files changed, 9 insertions, 25 deletions

diff --git a/plugins/QuickContacts/quickcontacts_10.vcxproj b/plugins/QuickContacts/quickcontacts_10.vcxproj
index e5db75a498..3c5883be42 100644
--- a/plugins/QuickContacts/quickcontacts_10.vcxproj
+++ b/plugins/QuickContacts/quickcontacts_10.vcxproj
@@ -96,7 +96,6 @@
       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

-      <DelayLoadDLLs>mir_core.dll</DelayLoadDLLs>

       <SubSystem>Windows</SubSystem>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

     </Link>

@@ -128,7 +127,6 @@
       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

-      <DelayLoadDLLs>mir_core.dll</DelayLoadDLLs>

       <SubSystem>Windows</SubSystem>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

     </Link>

@@ -155,7 +153,6 @@
       <BaseAddress>0x32100000</BaseAddress>

       <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>

       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

-      <DelayLoadDLLs>mir_core.dll</DelayLoadDLLs>

       <SubSystem>Windows</SubSystem>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

       <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

@@ -183,7 +180,6 @@
       <BaseAddress>0x32100000</BaseAddress>

       <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>

       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

-      <DelayLoadDLLs>mir_core.dll</DelayLoadDLLs>

       <SubSystem>Windows</SubSystem>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

     </Link>

diff --git a/plugins/QuickContacts/quickcontacts_10.vcxproj.filters b/plugins/QuickContacts/quickcontacts_10.vcxproj.filters
index 8a3849ef60..65446fb157 100644
--- a/plugins/QuickContacts/quickcontacts_10.vcxproj.filters
+++ b/plugins/QuickContacts/quickcontacts_10.vcxproj.filters
@@ -18,9 +18,6 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="..\utils\mir_memory.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

     <ClInclude Include="..\utils\mir_options.h">

       <Filter>Header Files</Filter>

     </ClInclude>

@@ -33,6 +30,9 @@
     <ClInclude Include="src\resource.h">

       <Filter>Header Files</Filter>

     </ClInclude>

+    <ClInclude Include="src\Version.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

   </ItemGroup>

   <ItemGroup>

     <ClCompile Include="src\options.cpp">

@@ -44,24 +44,16 @@
     <ClCompile Include="..\Utils\mir_options.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-  </ItemGroup>

-  <ItemGroup>

-    <None Include="Docs\langpack_quickcontacts.txt">

-      <Filter>Docs</Filter>

-    </None>

-    <None Include="Docs\quickcontacts_changelog.txt">

-      <Filter>Docs</Filter>

-    </None>

-    <None Include="Docs\quickcontacts_readme.txt">

-      <Filter>Docs</Filter>

-    </None>

-    <None Include="Docs\quickcontacts_version.txt">

-      <Filter>Docs</Filter>

-    </None>

+    <ClCompile Include="src\stdafx.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

   </ItemGroup>

   <ItemGroup>

     <ResourceCompile Include="res\resource.rc">

       <Filter>Resource Files</Filter>

     </ResourceCompile>

+    <ResourceCompile Include="res\Version.rc">

+      <Filter>Source Files</Filter>

+    </ResourceCompile>

   </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/plugins/QuickContacts/quickcontacts_11.vcxproj b/plugins/QuickContacts/quickcontacts_11.vcxproj
index b6ffc69299..54d0dcd826 100644
--- a/plugins/QuickContacts/quickcontacts_11.vcxproj
+++ b/plugins/QuickContacts/quickcontacts_11.vcxproj
@@ -100,7 +100,6 @@
       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

-      <DelayLoadDLLs>mir_core.dll</DelayLoadDLLs>

       <SubSystem>Windows</SubSystem>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

     </Link>

@@ -132,7 +131,6 @@
       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

-      <DelayLoadDLLs>mir_core.dll</DelayLoadDLLs>

       <SubSystem>Windows</SubSystem>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

     </Link>

@@ -159,7 +157,6 @@
       <BaseAddress>0x32100000</BaseAddress>

       <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin11\lib</AdditionalLibraryDirectories>

       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

-      <DelayLoadDLLs>mir_core.dll</DelayLoadDLLs>

       <SubSystem>Windows</SubSystem>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

       <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

@@ -188,7 +185,6 @@
       <BaseAddress>0x32100000</BaseAddress>

       <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin11\lib</AdditionalLibraryDirectories>

       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

-      <DelayLoadDLLs>mir_core.dll</DelayLoadDLLs>

       <SubSystem>Windows</SubSystem>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

     </Link>