64-bit compatible version of CryptoPP

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

1 files changed, 50 insertions, 5 deletions

diff --git a/plugins/CryptoPP/cryptopp_11.vcxproj b/plugins/CryptoPP/cryptopp_11.vcxproj
index 079152c9df..8c7a4df0a3 100644
--- a/plugins/CryptoPP/cryptopp_11.vcxproj
+++ b/plugins/CryptoPP/cryptopp_11.vcxproj
@@ -93,11 +93,12 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>

       <BaseAddress>0x46000000</BaseAddress>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

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

+      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin11\lib;.\src\PGPw\sdk8\lib</AdditionalLibraryDirectories>

       <AdditionalDependencies>ws2_32.lib;$(SolutionDir)$(Configuration)\Obj\cryptlib\cryptlib.lib;%(AdditionalDependencies)</AdditionalDependencies>

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

       <SubSystem>Windows</SubSystem>

       <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>

+      <DelayLoadDLLs>pgpsdk.dll;pgpsdknl.dll;pgpsdkui.dll</DelayLoadDLLs>

     </Link>

   </ItemDefinitionGroup>

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

@@ -118,10 +119,11 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>

       <BaseAddress>0x46000000</BaseAddress>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

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

+      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin11\lib;.\src\PGPw\sdk8\lib</AdditionalLibraryDirectories>

       <AdditionalDependencies>ws2_32.lib;$(SolutionDir)$(Configuration)64\Obj\cryptlib\cryptlib.lib;%(AdditionalDependencies)</AdditionalDependencies>

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

       <SubSystem>Windows</SubSystem>

+      <DelayLoadDLLs>pgpsdk.dll;pgpsdknl.dll;pgpsdkui.dll</DelayLoadDLLs>

     </Link>

   </ItemDefinitionGroup>

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

@@ -143,13 +145,14 @@
     <Link>

       <BaseAddress>0x46000000</BaseAddress>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

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

+      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin11\lib;.\src\PGPw\sdk8\lib</AdditionalLibraryDirectories>

       <AdditionalDependencies>ws2_32.lib;$(SolutionDir)$(Configuration)\Obj\cryptlib\cryptlib.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <SubSystem>Windows</SubSystem>

+      <DelayLoadDLLs>pgpsdk.dll;pgpsdknl.dll;pgpsdkui.dll</DelayLoadDLLs>

     </Link>

   </ItemDefinitionGroup>

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

@@ -171,18 +174,49 @@
     <Link>

       <BaseAddress>0x46000000</BaseAddress>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

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

+      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin11\lib;.\src\PGPw\sdk8\lib</AdditionalLibraryDirectories>

       <AdditionalDependencies>ws2_32.lib;$(SolutionDir)$(Configuration)64\Obj\cryptlib\cryptlib.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <SubSystem>Windows</SubSystem>

+      <DelayLoadDLLs>pgpsdk.dll;pgpsdknl.dll;pgpsdkui.dll</DelayLoadDLLs>

     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

     <ClCompile Include="src\base16.cpp" />

     <ClCompile Include="src\base64.cpp" />

+    <ClCompile Include="src\GPGw\gpg.cpp">

+      <PrecompiledHeaderFile>../commonheaders.h</PrecompiledHeaderFile>

+    </ClCompile>

+    <ClCompile Include="src\GPGw\gpg_main.cpp">

+      <PrecompiledHeaderFile>../commonheaders.h</PrecompiledHeaderFile>

+    </ClCompile>

+    <ClCompile Include="src\GPGw\keys.cpp">

+      <PrecompiledHeaderFile>../commonheaders.h</PrecompiledHeaderFile>

+    </ClCompile>

+    <ClCompile Include="src\GPGw\language.cpp">

+      <PrecompiledHeaderFile>../commonheaders.h</PrecompiledHeaderFile>

+    </ClCompile>

+    <ClCompile Include="src\GPGw\passdialog.cpp">

+      <PrecompiledHeaderFile>../commonheaders.h</PrecompiledHeaderFile>

+    </ClCompile>

+    <ClCompile Include="src\GPGw\passphrases.cpp">

+      <PrecompiledHeaderFile>../commonheaders.h</PrecompiledHeaderFile>

+    </ClCompile>

+    <ClCompile Include="src\GPGw\pipeexec.cpp">

+      <PrecompiledHeaderFile>../commonheaders.h</PrecompiledHeaderFile>

+    </ClCompile>

+    <ClCompile Include="src\GPGw\tools.cpp">

+      <PrecompiledHeaderFile>../commonheaders.h</PrecompiledHeaderFile>

+    </ClCompile>

+    <ClCompile Include="src\GPGw\userdialog.cpp">

+      <PrecompiledHeaderFile>../commonheaders.h</PrecompiledHeaderFile>

+    </ClCompile>

+    <ClCompile Include="src\PGPw\sdk8.cpp">

+      <PrecompiledHeaderFile>../commonheaders.h</PrecompiledHeaderFile>

+    </ClCompile>

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

       <PrecompiledHeader>Create</PrecompiledHeader>

     </ClCompile>

@@ -210,14 +244,25 @@
     <ClInclude Include="src\cryptopp.h" />

     <ClInclude Include="src\dllloader.h" />

     <ClInclude Include="src\gettime.h" />

+    <ClInclude Include="src\GPGw\gpg.h" />

+    <ClInclude Include="src\GPGw\gpgw.h" />

+    <ClInclude Include="src\GPGw\keys.h" />

+    <ClInclude Include="src\GPGw\language.h" />

+    <ClInclude Include="src\GPGw\passdialog.h" />

+    <ClInclude Include="src\GPGw\passphrases.h" />

+    <ClInclude Include="src\GPGw\pipeexec.h" />

+    <ClInclude Include="src\GPGw\size.h" />

+    <ClInclude Include="src\GPGw\tools.h" />

+    <ClInclude Include="src\GPGw\userdialog.h" />

     <ClInclude Include="src\mmi.h" />

+    <ClInclude Include="src\PGPw\commonheaders.h" />

     <ClInclude Include="src\resource.h" />

     <ClInclude Include="src\utf8.h" />

     <ClInclude Include="src\version.h" />

   </ItemGroup>

   <ItemGroup>

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

     <ResourceCompile Include="res\version.rc" />

+    <ResourceCompile Include="src\GPGw\gpg.rc" />

   </ItemGroup>

   <ItemGroup>

     <ProjectReference Include="crypto\cryptlib_11.vcxproj">