projects cleanup

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

14 files changed, 52 insertions, 93 deletions

diff --git a/plugins/Alarms/alarms_10.vcxproj b/plugins/Alarms/alarms_10.vcxproj
index 751475ea44..0e4120925a 100644
--- a/plugins/Alarms/alarms_10.vcxproj
+++ b/plugins/Alarms/alarms_10.vcxproj
@@ -93,13 +93,13 @@
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

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

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <SubSystem>Windows</SubSystem>

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

     </Link>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

@@ -119,13 +119,13 @@
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

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

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <SubSystem>Windows</SubSystem>

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

     </Link>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

@@ -147,11 +147,11 @@
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

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

       <SubSystem>Windows</SubSystem>

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

     </Link>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

@@ -171,11 +171,11 @@
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

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

       <SubSystem>Windows</SubSystem>

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

     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

diff --git a/plugins/QuickMessages/quickmessages_10.vcxproj b/plugins/QuickMessages/quickmessages_10.vcxproj
index a93a06be35..e80b166644 100644
--- a/plugins/QuickMessages/quickmessages_10.vcxproj
+++ b/plugins/QuickMessages/quickmessages_10.vcxproj
@@ -92,7 +92,6 @@
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

-      <AdditionalDependencies>msimg32.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <BaseAddress>0x67100000</BaseAddress>

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

       <OptimizeReferences>true</OptimizeReferences>

@@ -118,7 +117,6 @@
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

-      <AdditionalDependencies>msimg32.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <BaseAddress>0x67100000</BaseAddress>

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

       <OptimizeReferences>true</OptimizeReferences>

@@ -147,7 +145,6 @@
       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

       <SubSystem>Windows</SubSystem>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

-      <AdditionalDependencies>msimg32.lib;%(AdditionalDependencies)</AdditionalDependencies>

     </Link>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

@@ -168,7 +165,6 @@
       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

       <SubSystem>Windows</SubSystem>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

-      <AdditionalDependencies>msimg32.lib;%(AdditionalDependencies)</AdditionalDependencies>

     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

diff --git a/plugins/QuickReplies/quickreplies_10.vcxproj b/plugins/QuickReplies/quickreplies_10.vcxproj
index 4c05d38668..d8fba070f9 100644
--- a/plugins/QuickReplies/quickreplies_10.vcxproj
+++ b/plugins/QuickReplies/quickreplies_10.vcxproj
@@ -91,7 +91,6 @@
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

@@ -119,7 +118,6 @@
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

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

@@ -145,7 +143,6 @@
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

@@ -172,7 +169,6 @@
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

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

diff --git a/plugins/Rate/rate_10.vcxproj b/plugins/Rate/rate_10.vcxproj
index 3c34e9caad..71b7f48df7 100644
--- a/plugins/Rate/rate_10.vcxproj
+++ b/plugins/Rate/rate_10.vcxproj
@@ -88,7 +88,6 @@
       <SubSystem>Windows</SubSystem>

       <BaseAddress>0x22620000</BaseAddress>

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

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

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

     </Link>

     <ResourceCompile>

@@ -110,7 +109,6 @@
       <SubSystem>Windows</SubSystem>

       <BaseAddress>0x22620000</BaseAddress>

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

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

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

     </Link>

     <ResourceCompile>

@@ -133,7 +131,6 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>

       <BaseAddress>0x22620000</BaseAddress>

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

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

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

     </Link>

     <ResourceCompile>

@@ -156,7 +153,6 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>

       <BaseAddress>0x22620000</BaseAddress>

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

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

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

     </Link>

     <ResourceCompile>

diff --git a/plugins/Scriver/scriver_10.vcxproj b/plugins/Scriver/scriver_10.vcxproj
index 2ba1d70a30..6cf7b99adb 100644
--- a/plugins/Scriver/scriver_10.vcxproj
+++ b/plugins/Scriver/scriver_10.vcxproj
@@ -94,7 +94,7 @@
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

-      <AdditionalDependencies>comctl32.lib;shlwapi.lib;Version.lib;%(AdditionalDependencies)</AdditionalDependencies>

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

       <AdditionalManifestDependencies>type=%27Win32%27 name=%27Microsoft.Windows.Common-Controls%27 version=%276.0.0.0%27 processorArchitecture=%27X86%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27;%(AdditionalManifestDependencies)</AdditionalManifestDependencies>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

@@ -126,7 +126,7 @@
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

-      <AdditionalDependencies>comctl32.lib;shlwapi.lib;Version.lib;%(AdditionalDependencies)</AdditionalDependencies>

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

       <AdditionalManifestDependencies>type=%27Win32%27 name=%27Microsoft.Windows.Common-Controls%27 version=%276.0.0.0%27 processorArchitecture=%27*%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27;%(AdditionalManifestDependencies)</AdditionalManifestDependencies>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

@@ -156,7 +156,7 @@
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

-      <AdditionalDependencies>comctl32.lib;shlwapi.lib;Version.lib;%(AdditionalDependencies)</AdditionalDependencies>

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

       <AdditionalManifestDependencies>type=%27Win32%27 name=%27Microsoft.Windows.Common-Controls%27 version=%276.0.0.0%27 processorArchitecture=%27X86%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27;%(AdditionalManifestDependencies)</AdditionalManifestDependencies>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

@@ -183,7 +183,7 @@
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

-      <AdditionalDependencies>comctl32.lib;shlwapi.lib;Version.lib;%(AdditionalDependencies)</AdditionalDependencies>

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

       <AdditionalManifestDependencies>type=%27Win32%27 name=%27Microsoft.Windows.Common-Controls%27 version=%276.0.0.0%27 processorArchitecture=%27*%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27;%(AdditionalManifestDependencies)</AdditionalManifestDependencies>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

diff --git a/plugins/Sessions/Sessions_10.vcxproj b/plugins/Sessions/Sessions_10.vcxproj
index c0b08ad7ba..4c3641514d 100644
--- a/plugins/Sessions/Sessions_10.vcxproj
+++ b/plugins/Sessions/Sessions_10.vcxproj
@@ -94,7 +94,6 @@
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

-      <AdditionalDependencies>msimg32.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <BaseAddress>0x67100000</BaseAddress>

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

       <OptimizeReferences>true</OptimizeReferences>

@@ -122,7 +121,6 @@
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

-      <AdditionalDependencies>msimg32.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <BaseAddress>0x67100000</BaseAddress>

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

       <OptimizeReferences>true</OptimizeReferences>

@@ -152,7 +150,6 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>

       <BaseAddress>0x67100000</BaseAddress>

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

-      <AdditionalDependencies>msimg32.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

       <SubSystem>Windows</SubSystem>

     </Link>

@@ -176,7 +173,6 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>

       <BaseAddress>0x67100000</BaseAddress>

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

-      <AdditionalDependencies>msimg32.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

       <SubSystem>Windows</SubSystem>

     </Link>

diff --git a/plugins/SmileyAdd/SmileyAdd_10.vcxproj b/plugins/SmileyAdd/SmileyAdd_10.vcxproj
index 93e4f2c0bb..69abb5d4f7 100644
--- a/plugins/SmileyAdd/SmileyAdd_10.vcxproj
+++ b/plugins/SmileyAdd/SmileyAdd_10.vcxproj
@@ -92,14 +92,14 @@
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

-      <AdditionalDependencies>comctl32.lib;Delayimp.lib;gdiplus.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <DelayLoadDLLs>gdiplus.dll;%(DelayLoadDLLs)</DelayLoadDLLs>

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <SubSystem>Windows</SubSystem>

       <BaseAddress>0x28110000</BaseAddress>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

       <SupportUnloadOfDelayLoadedDLL>true</SupportUnloadOfDelayLoadedDLL>

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

+      <DelayLoadDLLs>gdiplus.dll;%(DelayLoadDLLs)</DelayLoadDLLs>

     </Link>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

@@ -117,14 +117,14 @@
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

-      <AdditionalDependencies>comctl32.lib;Delayimp.lib;gdiplus.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <DelayLoadDLLs>gdiplus.dll;%(DelayLoadDLLs)</DelayLoadDLLs>

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <BaseAddress>0x28110000</BaseAddress>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

       <SupportUnloadOfDelayLoadedDLL>true</SupportUnloadOfDelayLoadedDLL>

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

       <SubSystem>Windows</SubSystem>

+      <DelayLoadDLLs>gdiplus.dll;%(DelayLoadDLLs)</DelayLoadDLLs>

     </Link>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

@@ -148,8 +148,7 @@
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

-      <AdditionalDependencies>comctl32.lib;Delayimp.lib;gdiplus.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <DelayLoadDLLs>gdiplus.dll;%(DelayLoadDLLs)</DelayLoadDLLs>

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

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

       <BaseAddress>0x28110000</BaseAddress>

@@ -158,6 +157,7 @@
       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <SubSystem>Windows</SubSystem>

+      <DelayLoadDLLs>gdiplus.dll;%(DelayLoadDLLs)</DelayLoadDLLs>

     </Link>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

@@ -180,8 +180,7 @@
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

-      <AdditionalDependencies>comctl32.lib;Delayimp.lib;gdiplus.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <DelayLoadDLLs>gdiplus.dll;%(DelayLoadDLLs)</DelayLoadDLLs>

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

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

       <BaseAddress>0x28110000</BaseAddress>

@@ -190,6 +189,7 @@
       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <SubSystem>Windows</SubSystem>

+      <DelayLoadDLLs>gdiplus.dll;%(DelayLoadDLLs)</DelayLoadDLLs>

     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

diff --git a/plugins/SplashScreen/splashscreen_10.vcxproj b/plugins/SplashScreen/splashscreen_10.vcxproj
index 2305ddab70..6453a40081 100644
--- a/plugins/SplashScreen/splashscreen_10.vcxproj
+++ b/plugins/SplashScreen/splashscreen_10.vcxproj
@@ -93,7 +93,7 @@
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

-      <AdditionalDependencies>winmm.lib;Version.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

@@ -120,7 +120,7 @@
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

-      <AdditionalDependencies>winmm.lib;Version.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

@@ -146,7 +146,7 @@
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

-      <AdditionalDependencies>winmm.lib;Version.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

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

@@ -168,7 +168,7 @@
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

-      <AdditionalDependencies>winmm.lib;Version.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

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

diff --git a/plugins/SplashScreen/splashscreen_10.vcxproj.filters b/plugins/SplashScreen/splashscreen_10.vcxproj.filters
index c7f02f8a8d..2ce679ed16 100644
--- a/plugins/SplashScreen/splashscreen_10.vcxproj.filters
+++ b/plugins/SplashScreen/splashscreen_10.vcxproj.filters
@@ -56,15 +56,6 @@
     <ClInclude Include="src\resource.h">

       <Filter>Resource Files</Filter>

     </ClInclude>

-    <ClInclude Include="src\m_folders.h">

-      <Filter>API</Filter>

-    </ClInclude>

-    <ClInclude Include="src\m_splash.h">

-      <Filter>API</Filter>

-    </ClInclude>

-    <ClInclude Include="src\m_updater.h">

-      <Filter>API</Filter>

-    </ClInclude>

   </ItemGroup>

   <ItemGroup>

     <ResourceCompile Include="src\splash.rc">

diff --git a/plugins/StatusPlugins/StartupStatus/StartupStatus_10.vcxproj b/plugins/StatusPlugins/StartupStatus/StartupStatus_10.vcxproj
index 86cfac22c3..153af509f7 100644
--- a/plugins/StatusPlugins/StartupStatus/StartupStatus_10.vcxproj
+++ b/plugins/StatusPlugins/StartupStatus/StartupStatus_10.vcxproj
@@ -90,14 +90,12 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

-      <DelayLoadDLLs>wininet.dll;%(DelayLoadDLLs)</DelayLoadDLLs>

       <GenerateDebugInformation>true</GenerateDebugInformation>

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

       <SubSystem>Windows</SubSystem>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

       <BaseAddress>0x11bd0000</BaseAddress>

-      <AdditionalDependencies>wininet.lib;Delayimp.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <SupportUnloadOfDelayLoadedDLL>true</SupportUnloadOfDelayLoadedDLL>

+      <AdditionalDependencies>wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>

     </Link>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

@@ -123,8 +121,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

-      <AdditionalDependencies>wininet.lib;Delayimp.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <DelayLoadDLLs>wininet.dll;%(DelayLoadDLLs)</DelayLoadDLLs>

+      <AdditionalDependencies>wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

@@ -132,7 +129,6 @@
       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

       <SubSystem>Windows</SubSystem>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

-      <SupportUnloadOfDelayLoadedDLL>true</SupportUnloadOfDelayLoadedDLL>

     </Link>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

@@ -154,8 +150,7 @@
       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

     </ClCompile>

     <Link>

-      <AdditionalDependencies>wininet.lib;Delayimp.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <DelayLoadDLLs>wininet.dll;%(DelayLoadDLLs)</DelayLoadDLLs>

+      <AdditionalDependencies>wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

       <GenerateDebugInformation>true</GenerateDebugInformation>

@@ -163,7 +158,6 @@
       <SubSystem>Windows</SubSystem>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

       <BaseAddress>0x11bd0000</BaseAddress>

-      <SupportUnloadOfDelayLoadedDLL>true</SupportUnloadOfDelayLoadedDLL>

     </Link>

     <ResourceCompile>

       <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

@@ -183,14 +177,12 @@
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

     </ClCompile>

     <Link>

-      <AdditionalDependencies>wininet.lib;Delayimp.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <DelayLoadDLLs>wininet.dll;%(DelayLoadDLLs)</DelayLoadDLLs>

+      <AdditionalDependencies>wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <GenerateDebugInformation>true</GenerateDebugInformation>

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

       <SubSystem>Windows</SubSystem>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

       <BaseAddress>0x11bd0000</BaseAddress>

-      <SupportUnloadOfDelayLoadedDLL>true</SupportUnloadOfDelayLoadedDLL>

     </Link>

     <ResourceCompile>

       <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

diff --git a/plugins/Svc_crshdmp/crshdmp_10.vcxproj b/plugins/Svc_crshdmp/crshdmp_10.vcxproj
index 6c65572ae8..95c442e52a 100644
--- a/plugins/Svc_crshdmp/crshdmp_10.vcxproj
+++ b/plugins/Svc_crshdmp/crshdmp_10.vcxproj
@@ -89,8 +89,8 @@
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

     </ClCompile>

     <Link>

-      <AdditionalDependencies>Delayimp.lib;dbghelp.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <DelayLoadDLLs>dbghelp.dll;advapi32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>

+      <AdditionalDependencies>dbghelp.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <DelayLoadDLLs>dbghelp.dll;%(DelayLoadDLLs)</DelayLoadDLLs>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <SubSystem>Windows</SubSystem>

       <OptimizeReferences>true</OptimizeReferences>

@@ -121,8 +121,8 @@
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

     </ClCompile>

     <Link>

-      <AdditionalDependencies>Delayimp.lib;dbghelp.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <DelayLoadDLLs>dbghelp.dll;advapi32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>

+      <AdditionalDependencies>dbghelp.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <DelayLoadDLLs>dbghelp.dll;%(DelayLoadDLLs)</DelayLoadDLLs>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <SubSystem>Windows</SubSystem>

       <OptimizeReferences>true</OptimizeReferences>

@@ -149,8 +149,8 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

     </ClCompile>

     <Link>

-      <AdditionalDependencies>Delayimp.lib;dbghelp.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <DelayLoadDLLs>dbghelp.dll;advapi32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>

+      <AdditionalDependencies>dbghelp.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <DelayLoadDLLs>dbghelp.dll;%(DelayLoadDLLs)</DelayLoadDLLs>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <SubSystem>Windows</SubSystem>

       <SupportUnloadOfDelayLoadedDLL>true</SupportUnloadOfDelayLoadedDLL>

@@ -174,8 +174,8 @@
       <WarningLevel>Level3</WarningLevel>

     </ClCompile>

     <Link>

-      <AdditionalDependencies>Delayimp.lib;dbghelp.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <DelayLoadDLLs>dbghelp.dll;advapi32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>

+      <AdditionalDependencies>dbghelp.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <DelayLoadDLLs>dbghelp.dll;%(DelayLoadDLLs)</DelayLoadDLLs>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <SubSystem>Windows</SubSystem>

       <SupportUnloadOfDelayLoadedDLL>true</SupportUnloadOfDelayLoadedDLL>

diff --git a/plugins/TabSRMM/tabsrmm_10.vcxproj b/plugins/TabSRMM/tabsrmm_10.vcxproj
index 96aea9e9be..e4f93acb17 100644
--- a/plugins/TabSRMM/tabsrmm_10.vcxproj
+++ b/plugins/TabSRMM/tabsrmm_10.vcxproj
@@ -94,7 +94,7 @@
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

+      <AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

@@ -126,7 +126,7 @@
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

+      <AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

@@ -156,7 +156,7 @@
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

+      <AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

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

@@ -183,7 +183,7 @@
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

+      <AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

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

diff --git a/plugins/Updater/updater_10.vcxproj b/plugins/Updater/updater_10.vcxproj
index 935436291b..551cd0c657 100644
--- a/plugins/Updater/updater_10.vcxproj
+++ b/plugins/Updater/updater_10.vcxproj
@@ -92,15 +92,15 @@
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

+      <AdditionalDependencies>zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <AdditionalLibraryDirectories>zbin/x32</AdditionalLibraryDirectories>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <BaseAddress>0x22000000</BaseAddress>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

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

-      <DelayLoadDLLs>zlib.dll</DelayLoadDLLs>

+      <DelayLoadDLLs>

+      </DelayLoadDLLs>

       <SubSystem>Windows</SubSystem>

-      <SupportUnloadOfDelayLoadedDLL>true</SupportUnloadOfDelayLoadedDLL>

     </Link>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

@@ -118,15 +118,15 @@
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

+      <AdditionalDependencies>zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <AdditionalLibraryDirectories>zbin/x64</AdditionalLibraryDirectories>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <BaseAddress>0x22000000</BaseAddress>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

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

-      <DelayLoadDLLs>zlib.dll</DelayLoadDLLs>

+      <DelayLoadDLLs>

+      </DelayLoadDLLs>

       <SubSystem>Windows</SubSystem>

-      <SupportUnloadOfDelayLoadedDLL>true</SupportUnloadOfDelayLoadedDLL>

     </Link>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

@@ -150,7 +150,7 @@
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

+      <AdditionalDependencies>zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <AdditionalLibraryDirectories>zbin/x32</AdditionalLibraryDirectories>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

@@ -158,9 +158,9 @@
       <BaseAddress>0x22000000</BaseAddress>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

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

-      <DelayLoadDLLs>zlib.dll</DelayLoadDLLs>

+      <DelayLoadDLLs>

+      </DelayLoadDLLs>

       <SubSystem>Windows</SubSystem>

-      <SupportUnloadOfDelayLoadedDLL>true</SupportUnloadOfDelayLoadedDLL>

     </Link>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

@@ -184,7 +184,7 @@
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

+      <AdditionalDependencies>zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <AdditionalLibraryDirectories>zbin/x64</AdditionalLibraryDirectories>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

@@ -192,9 +192,9 @@
       <BaseAddress>0x22000000</BaseAddress>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

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

-      <DelayLoadDLLs>zlib.dll</DelayLoadDLLs>

+      <DelayLoadDLLs>

+      </DelayLoadDLLs>

       <SubSystem>Windows</SubSystem>

-      <SupportUnloadOfDelayLoadedDLL>true</SupportUnloadOfDelayLoadedDLL>

     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

diff --git a/plugins/Variables/Variables_10.vcxproj b/plugins/Variables/Variables_10.vcxproj
index a493481062..713ab216e8 100644
--- a/plugins/Variables/Variables_10.vcxproj
+++ b/plugins/Variables/Variables_10.vcxproj
@@ -90,13 +90,11 @@
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

-      <AdditionalDependencies>pdh.lib;Ws2_32.lib;Delayimp.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <DelayLoadDLLs>pdh.dll;%(DelayLoadDLLs)</DelayLoadDLLs>

+      <AdditionalDependencies>pdh.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

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

       <SubSystem>Windows</SubSystem>

-      <SupportUnloadOfDelayLoadedDLL>true</SupportUnloadOfDelayLoadedDLL>

     </Link>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

@@ -118,15 +116,13 @@
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

-      <AdditionalDependencies>pdh.lib;Ws2_32.lib;Delayimp.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <DelayLoadDLLs>pdh.dll;%(DelayLoadDLLs)</DelayLoadDLLs>

+      <AdditionalDependencies>pdh.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

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

       <SubSystem>Windows</SubSystem>

-      <SupportUnloadOfDelayLoadedDLL>true</SupportUnloadOfDelayLoadedDLL>

     </Link>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

@@ -145,15 +141,13 @@
       <PrecompiledHeaderFile>variables.h</PrecompiledHeaderFile>

     </ClCompile>

     <Link>

-      <AdditionalDependencies>pdh.lib;Ws2_32.lib;Delayimp.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>pdh.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <GenerateDebugInformation>true</GenerateDebugInformation>

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

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <DelayLoadDLLs>pdh.dll;%(DelayLoadDLLs)</DelayLoadDLLs>

       <SubSystem>Windows</SubSystem>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

-      <SupportUnloadOfDelayLoadedDLL>true</SupportUnloadOfDelayLoadedDLL>

     </Link>

     <ResourceCompile>

       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

@@ -173,13 +167,11 @@
       <PrecompiledHeaderFile>variables.h</PrecompiledHeaderFile>

     </ClCompile>

     <Link>

-      <AdditionalDependencies>pdh.lib;Ws2_32.lib;Delayimp.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>pdh.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <GenerateDebugInformation>true</GenerateDebugInformation>

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

-      <DelayLoadDLLs>pdh.dll;%(DelayLoadDLLs)</DelayLoadDLLs>

       <SubSystem>Windows</SubSystem>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

-      <SupportUnloadOfDelayLoadedDLL>true</SupportUnloadOfDelayLoadedDLL>

     </Link>

     <ResourceCompile>

       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>