Skip to content

Commit 3bdcef2

Browse files
aleks-faleks-f
committed
GH pocoproject#61: static_md build configs for Crypto and NetSSL
fixed GH pocoproject#61: static_md build configs for Crypto and NetSSL
1 parent 3efbbdc commit 3bdcef2

68 files changed

Lines changed: 150 additions & 134 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CHANGELOG‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ Release 1.5.2 (2013-03-??)
3030
- fixed GH #127: Eliminate -Wshadow warnings
3131
- SocketAddress small object optimization
3232
- fixed GH #79: Poco::Thread leak on Linux
33+
- fixed GH #61: static_md build configs for Crypto and NetSSL
3334

3435
Release 1.5.1 (2013-01-11)
3536
==========================

‎Crypto/Crypto.progen‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ vc.project.compiler.defines.release_shared = ${vc.project.compiler.defines.share
1515
vc.project.linker.dependencies = ws2_32.lib iphlpapi.lib
1616
vc.project.linker.dependencies.debug_shared = libeay32.lib ssleay32.lib
1717
vc.project.linker.dependencies.release_shared = libeay32.lib ssleay32.lib
18-
vc.project.linker.dependencies.debug_static_md = libeay32.lib ssleay32.lib
19-
vc.project.linker.dependencies.release_static_md = libeay32.lib ssleay32.lib
18+
vc.project.linker.dependencies.debug_static_md = libeay32mdd.lib ssleay32mdd.lib Crypt32.lib
19+
vc.project.linker.dependencies.release_static_md = libeay32md.lib ssleay32md.lib Crypt32.lib
2020
vc.project.linker.dependencies.debug_static_mt = libeay32mtd.lib ssleay32mtd.lib Crypt32.lib
2121
vc.project.linker.dependencies.release_static_mt = libeay32mt.lib ssleay32mt.lib Crypt32.lib
2222
vc.solution.create = true

‎Crypto/Crypto_vs100.vcxproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@
126126
<SuppressStartupBanner>true</SuppressStartupBanner>
127127
<GenerateDebugInformation>true</GenerateDebugInformation>
128128
<ProgramDatabaseFile>..\bin\PocoCryptod.pdb</ProgramDatabaseFile>
129-
<AdditionalLibraryDirectories>..\lib;C:\OpenSSL\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
129+
<AdditionalLibraryDirectories>..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
130130
<SubSystem>Console</SubSystem>
131131
<ImportLibrary>..\lib\PocoCryptod.lib</ImportLibrary>
132132
<TargetMachine>MachineX86</TargetMachine>
@@ -158,7 +158,7 @@
158158
<OutputFile>..\bin\PocoCrypto.dll</OutputFile>
159159
<SuppressStartupBanner>true</SuppressStartupBanner>
160160
<GenerateDebugInformation>false</GenerateDebugInformation>
161-
<AdditionalLibraryDirectories>..\lib;C:\OpenSSL\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
161+
<AdditionalLibraryDirectories>..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
162162
<SubSystem>Console</SubSystem>
163163
<OptimizeReferences>true</OptimizeReferences>
164164
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -262,7 +262,7 @@
262262
<DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
263263
</ClCompile>
264264
<Lib>
265-
<AdditionalDependencies>ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
265+
<AdditionalDependencies>ws2_32.lib;iphlpapi.lib;libeay32md.lib;ssleay32md.lib;Crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
266266
<OutputFile>..\lib\PocoCryptomd.lib</OutputFile>
267267
</Lib>
268268
</ItemDefinitionGroup>

‎Crypto/Crypto_x64_vs110.sln‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
2-
# Visual Studio 2010
2+
# Visual Studio 2012
33
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Crypto", "Crypto_x64_vs110.vcxproj", "{EEEE7259-32E9-4D56-B023-C733940AB2A0}"
44
EndProject
55
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs110.vcxproj", "{C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}"

‎Crypto/Crypto_x64_vs110.vcxproj‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,12 @@
304304
<ClCompile Include="src\DigestEngine.cpp"/>
305305
</ItemGroup>
306306
<ItemGroup>
307-
<ResourceCompile Include="..\DLLVersion.rc"/>
307+
<ResourceCompile Include="..\DLLVersion.rc">
308+
<ExcludedFromBuild Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_md|x64&apos;">true</ExcludedFromBuild>
309+
<ExcludedFromBuild Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug_static_mt|x64&apos;">true</ExcludedFromBuild>
310+
<ExcludedFromBuild Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_md|x64&apos;">true</ExcludedFromBuild>
311+
<ExcludedFromBuild Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release_static_mt|x64&apos;">true</ExcludedFromBuild>
312+
</ResourceCompile>
308313
</ItemGroup>
309314
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
310315
<ImportGroup Label="ExtensionTargets"/>

‎Crypto/samples/genrsakey/genrsakey.progen‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ vc.project.linker.dependencies.x64 = ws2_32.lib iphlpapi.lib
1212
vc.project.linker.dependencies.WinCE = ws2.lib iphlpapi.lib
1313
vc.project.linker.dependencies.debug_shared = libeay32.lib ssleay32.lib
1414
vc.project.linker.dependencies.release_shared = libeay32.lib ssleay32.lib
15-
vc.project.linker.dependencies.debug_static_md = libeay32.lib ssleay32.lib
16-
vc.project.linker.dependencies.release_static_md = libeay32.lib ssleay32.lib
15+
vc.project.linker.dependencies.debug_static_md = libeay32mdd.lib ssleay32mdd.lib Crypt32.lib
16+
vc.project.linker.dependencies.release_static_md = libeay32md.lib ssleay32md.lib Crypt32.lib
1717
vc.project.linker.dependencies.debug_static_mt = libeay32mtd.lib ssleay32mtd.lib Crypt32.lib
1818
vc.project.linker.dependencies.release_static_mt = libeay32mt.lib ssleay32mt.lib Crypt32.lib

‎Crypto/samples/genrsakey/genrsakey_CE_VS90.vcproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@
349349
<Tool
350350
Name="VCLinkerTool"
351351
AdditionalOptions="/FORCE:MULTIPLE"
352-
AdditionalDependencies="iphlpapi.lib libeay32.lib ssleay32.lib ws2.lib iphlpapi.lib"
352+
AdditionalDependencies="iphlpapi.lib libeay32mdd.lib ssleay32mdd.lib Crypt32.lib ws2.lib iphlpapi.lib"
353353
OutputFile="bin\$(PlatformName)\static_md\genrsakeyd.exe"
354354
LinkIncremental="2"
355355
AdditionalLibraryDirectories="..\..\..\lib\$(PlatformName)"
@@ -424,7 +424,7 @@
424424
<Tool
425425
Name="VCLinkerTool"
426426
AdditionalOptions="/FORCE:MULTIPLE"
427-
AdditionalDependencies="iphlpapi.lib libeay32.lib ssleay32.lib ws2.lib iphlpapi.lib"
427+
AdditionalDependencies="iphlpapi.lib libeay32md.lib ssleay32md.lib Crypt32.lib ws2.lib iphlpapi.lib"
428428
OutputFile="bin\$(PlatformName)\static_md\genrsakey.exe"
429429
LinkIncremental="1"
430430
AdditionalLibraryDirectories="..\..\..\lib\$(PlatformName)"

‎Crypto/samples/genrsakey/genrsakey_VS71.vcproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@
287287
Name="VCCustomBuildTool"/>
288288
<Tool
289289
Name="VCLinkerTool"
290-
AdditionalDependencies="iphlpapi.lib winmm.lib libeay32.lib ssleay32.lib ws2_32.lib iphlpapi.lib"
290+
AdditionalDependencies="iphlpapi.lib winmm.lib libeay32mdd.lib ssleay32mdd.lib Crypt32.lib ws2_32.lib iphlpapi.lib"
291291
OutputFile="bin\static_md\genrsakeyd.exe"
292292
LinkIncremental="2"
293293
AdditionalLibraryDirectories="..\..\..\lib"
@@ -349,7 +349,7 @@
349349
Name="VCCustomBuildTool"/>
350350
<Tool
351351
Name="VCLinkerTool"
352-
AdditionalDependencies="iphlpapi.lib winmm.lib libeay32.lib ssleay32.lib ws2_32.lib iphlpapi.lib"
352+
AdditionalDependencies="iphlpapi.lib winmm.lib libeay32md.lib ssleay32md.lib Crypt32.lib ws2_32.lib iphlpapi.lib"
353353
OutputFile="bin\static_md\genrsakey.exe"
354354
LinkIncremental="1"
355355
AdditionalLibraryDirectories="..\..\..\lib"

‎Crypto/samples/genrsakey/genrsakey_VS80.vcproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@
327327
Name="VCPreLinkEventTool"/>
328328
<Tool
329329
Name="VCLinkerTool"
330-
AdditionalDependencies="iphlpapi.lib winmm.lib libeay32.lib ssleay32.lib ws2_32.lib iphlpapi.lib"
330+
AdditionalDependencies="iphlpapi.lib winmm.lib libeay32mdd.lib ssleay32mdd.lib Crypt32.lib ws2_32.lib iphlpapi.lib"
331331
OutputFile="bin\static_md\genrsakeyd.exe"
332332
LinkIncremental="2"
333333
AdditionalLibraryDirectories="..\..\..\lib"
@@ -396,7 +396,7 @@
396396
Name="VCPreLinkEventTool"/>
397397
<Tool
398398
Name="VCLinkerTool"
399-
AdditionalDependencies="iphlpapi.lib winmm.lib libeay32.lib ssleay32.lib ws2_32.lib iphlpapi.lib"
399+
AdditionalDependencies="iphlpapi.lib winmm.lib libeay32md.lib ssleay32md.lib Crypt32.lib ws2_32.lib iphlpapi.lib"
400400
OutputFile="bin\static_md\genrsakey.exe"
401401
LinkIncremental="1"
402402
AdditionalLibraryDirectories="..\..\..\lib"

‎Crypto/samples/genrsakey/genrsakey_VS90.vcproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@
327327
Name="VCPreLinkEventTool"/>
328328
<Tool
329329
Name="VCLinkerTool"
330-
AdditionalDependencies="iphlpapi.lib winmm.lib libeay32.lib ssleay32.lib ws2_32.lib iphlpapi.lib"
330+
AdditionalDependencies="iphlpapi.lib winmm.lib libeay32mdd.lib ssleay32mdd.lib Crypt32.lib ws2_32.lib iphlpapi.lib"
331331
OutputFile="bin\static_md\genrsakeyd.exe"
332332
LinkIncremental="2"
333333
AdditionalLibraryDirectories="..\..\..\lib"
@@ -396,7 +396,7 @@
396396
Name="VCPreLinkEventTool"/>
397397
<Tool
398398
Name="VCLinkerTool"
399-
AdditionalDependencies="iphlpapi.lib winmm.lib libeay32.lib ssleay32.lib ws2_32.lib iphlpapi.lib"
399+
AdditionalDependencies="iphlpapi.lib winmm.lib libeay32md.lib ssleay32md.lib Crypt32.lib ws2_32.lib iphlpapi.lib"
400400
OutputFile="bin\static_md\genrsakey.exe"
401401
LinkIncremental="1"
402402
AdditionalLibraryDirectories="..\..\..\lib"

0 commit comments

Comments
 (0)