PackUpdater:

removed not needed headers

git-svn-id: http://miranda-plugins.googlecode.com/svn/trunk@303 e753b5eb-9565-29b2-b5c5-2cc6f99dfbcb

2 files changed, 22 insertions, 28 deletions

diff --git a/PackUpdater/PackUpdater_10.vcxproj b/PackUpdater/PackUpdater_10.vcxproj
index f018f80..75d16e8 100644
--- a/PackUpdater/PackUpdater_10.vcxproj
+++ b/PackUpdater/PackUpdater_10.vcxproj
@@ -95,14 +95,11 @@
       <PrecompiledHeaderFile>Common.h</PrecompiledHeaderFile>

     </ClCompile>

     <Link>

-      <AdditionalDependencies>Wininet.lib;urlmon.lib;%(AdditionalDependencies)</AdditionalDependencies>

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <SubSystem>Windows</SubSystem>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

-      <DataExecutionPrevention>

-      </DataExecutionPrevention>

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

-      <TargetMachine>MachineX86</TargetMachine>

       <AdditionalManifestDependencies>

       </AdditionalManifestDependencies>

     </Link>

@@ -110,32 +107,35 @@
       <Command>

       </Command>

     </PostBuildEvent>

+    <ResourceCompile>

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

+    </ResourceCompile>

   </ItemDefinitionGroup>

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

     <ClCompile>

       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>../../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;PACKUPDATER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;PACKUPDATER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

       <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

       <DisableSpecificWarnings>4996</DisableSpecificWarnings>

       <PrecompiledHeader>Use</PrecompiledHeader>

       <PrecompiledHeaderFile>Common.h</PrecompiledHeaderFile>

     </ClCompile>

     <Link>

-      <AdditionalDependencies>Wininet.lib;urlmon.lib;%(AdditionalDependencies)</AdditionalDependencies>

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <SubSystem>Windows</SubSystem>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

-      <DataExecutionPrevention>

-      </DataExecutionPrevention>

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

     </Link>

     <PostBuildEvent>

       <Command>

       </Command>

     </PostBuildEvent>

+    <ResourceCompile>

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

+    </ResourceCompile>

   </ItemDefinitionGroup>

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

     <ClCompile>

@@ -144,22 +144,18 @@
       <AdditionalIncludeDirectories>../../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PACKUPDATER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

       <DisableSpecificWarnings>4996</DisableSpecificWarnings>

       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

       <PrecompiledHeader>Use</PrecompiledHeader>

       <PrecompiledHeaderFile>Common.h</PrecompiledHeaderFile>

     </ClCompile>

     <Link>

-      <AdditionalDependencies>Wininet.lib;urlmon.lib;%(AdditionalDependencies)</AdditionalDependencies>

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

       <SubSystem>Windows</SubSystem>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

-      <DataExecutionPrevention>

-      </DataExecutionPrevention>

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

-      <TargetMachine>MachineX86</TargetMachine>

       <AdditionalManifestDependencies>

       </AdditionalManifestDependencies>

     </Link>

@@ -167,30 +163,33 @@
       <AdditionalManifestFiles>

       </AdditionalManifestFiles>

     </Manifest>

+    <ResourceCompile>

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

+    </ResourceCompile>

   </ItemDefinitionGroup>

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

     <ClCompile>

       <Optimization>Full</Optimization>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <AdditionalIncludeDirectories>../../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PACKUPDATER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;PACKUPDATER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

       <DisableSpecificWarnings>4996</DisableSpecificWarnings>

       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

       <PrecompiledHeader>Use</PrecompiledHeader>

       <PrecompiledHeaderFile>Common.h</PrecompiledHeaderFile>

     </ClCompile>

     <Link>

-      <AdditionalDependencies>Wininet.lib;urlmon.lib;%(AdditionalDependencies)</AdditionalDependencies>

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

       <SubSystem>Windows</SubSystem>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

-      <DataExecutionPrevention>

-      </DataExecutionPrevention>

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

     </Link>

+    <ResourceCompile>

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

+    </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemGroup>

     <ResourceCompile Include="Resource.rc" />

diff --git a/PackUpdater/Src/Common.h b/PackUpdater/Src/Common.h
index 1222439..f690849 100644
--- a/PackUpdater/Src/Common.h
+++ b/PackUpdater/Src/Common.h
@@ -25,17 +25,11 @@ Boston, MA 02111-1307, USA.
 #include <stdio.h>

 #include <windows.h>

 #include <Windowsx.h>

-#include <deque>

-#include "Wininet.h"

-#include "Urlmon.h"

-#include <prsht.h>

-#include <string>

-#include <commctrl.h>

-#include "win2k.h"

 #include "vector"       // stl vector header

 #include <Shlobj.h>

 

 // Miranda header files

+#include "win2k.h"

 #include <newpluginapi.h>

 #include <m_clist.h>

 #include <m_skin.h>

@@ -44,13 +38,14 @@ Boston, MA 02111-1307, USA.
 #include <m_database.h>

 #include <m_utils.h>

 #include <m_system.h>

-#include <m_folders.h>

 #include <m_popup.h>

 #include <m_hotkeys.h>

-#include "m_popup2.h"

 #include <m_netlib.h>

 #include <m_icolib.h>

 

+#include <m_folders.h>

+#include "m_popup2.h"

+

 #include "..\version.h"

 #include "..\resource.h"

 #include "Notifications.h"