Skip to content

Commit

Permalink
Boost 1.55 + dynamic linking
Browse files Browse the repository at this point in the history
  • Loading branch information
@martinknafve
martinknafve committed Jul 1, 2014
1 parent 79d943e commit dd23470
Show file tree
Hide file tree
Showing 51,160 changed files with 2,018,424 additions and 1,393,917 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,4 @@ hmailserver/source/Server/hMailServer/hMailServer.ncb
hmailserver/source/Server/hMailServer/hMailServer_i.c
hmailserver/source/Server/hMailServer/hMailServer_p.c
hmailserver/source/Server/hMailServer/x64/*
hmailserver/source/Server/hMailServer/Release/*
2 changes: 1 addition & 1 deletion hmailserver/source/Server/Common/Application/MessageIndexer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ namespace HM
return nothing;
}

shared_ptr<MessageIndexer> result = shared_static_cast<MessageIndexer>(task);
shared_ptr<MessageIndexer> result = static_pointer_cast<MessageIndexer>(task);
return result;
}
catch (...)
Expand Down
8 changes: 4 additions & 4 deletions hmailserver/source/Server/Common/Application/ScriptingHost/ScriptObjectContainer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,15 +67,15 @@ namespace HM
case ScriptObject::OTResult:
{
CComObject<InterfaceResult> *pResultInt = new CComObject<InterfaceResult>();
shared_ptr<Result> pResult = shared_static_cast<Result>(pObj->pObject);
shared_ptr<Result> pResult = static_pointer_cast<Result>(pObj->pObject);
pResultInt->AttachItem(pResult);
pResultInt->QueryInterface(ppunkItem);
return true;
}
case ScriptObject::OTMessage:
{
CComObject<InterfaceMessage> *pInterface = new CComObject<InterfaceMessage>();
shared_ptr<Message> pObject = shared_static_cast<Message>(pObj->pObject);
shared_ptr<Message> pObject = static_pointer_cast<Message>(pObj->pObject);
pInterface->AttachItem(pObject);
pInterface->QueryInterface(ppunkItem);

Expand All @@ -84,7 +84,7 @@ namespace HM
case ScriptObject::OTClient:
{
CComObject<InterfaceClient> *pInterface = new CComObject<InterfaceClient>();
shared_ptr<ClientInfo> pObject = shared_static_cast<ClientInfo>(pObj->pObject);
shared_ptr<ClientInfo> pObject = static_pointer_cast<ClientInfo>(pObj->pObject);

pInterface->AttachItem(pObject);
pInterface->QueryInterface(ppunkItem);
Expand All @@ -99,7 +99,7 @@ namespace HM
case ScriptObject::OTFetchAccount:
{
CComObject<InterfaceFetchAccount> *pInterface = new CComObject<InterfaceFetchAccount>();
shared_ptr<FetchAccount> pObject = shared_static_cast<FetchAccount>(pObj->pObject);
shared_ptr<FetchAccount> pObject = static_pointer_cast<FetchAccount>(pObj->pObject);
pInterface->AttachItem(pObject);
pInterface->QueryInterface(ppunkItem);

Expand Down
2 changes: 1 addition & 1 deletion hmailserver/source/Server/IMAP/IMAPConnection.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -665,7 +665,7 @@ namespace HM

std::map<eIMAPCommandType, shared_ptr<IMAPCommand> >::iterator iterCommandHandler = mapCommandHandlers.find(IMAP_IDLE);
shared_ptr<IMAPCommand> pCommand = (*iterCommandHandler).second;
shared_ptr<IMAPCommandIdle> pIdleCommand = boost::shared_static_cast<IMAPCommandIdle>(pCommand);
shared_ptr<IMAPCommandIdle> pIdleCommand = boost::static_pointer_cast<IMAPCommandIdle>(pCommand);
pIdleCommand->Finish(true);
}

Expand Down
78 changes: 67 additions & 11 deletions hmailserver/source/Server/hMailServer/hMailServer.vcproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,12 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\Libraries\boost_1_52_0;..\..\..\..\Libraries\mssqlce3.5;&quot;..\..\..\..\Libraries\openssl-1.0.1h\include&quot;;..\..\..\..\Libraries\pgsql8.2.4\include"
AdditionalIncludeDirectories="..\..\..\..\Libraries\boost_1_55_0;..\..\..\..\Libraries\mssqlce3.5;&quot;..\..\..\..\Libraries\openssl-1.0.1h\include&quot;;..\..\..\..\Libraries\pgsql8.2.4\include"
PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;UNICODE;_UNICODE;BOOST_DATE_TIME_NO_LIB"
MinimalRebuild="false"
ExceptionHandling="2"
BasicRuntimeChecks="0"
RuntimeLibrary="1"
RuntimeLibrary="3"
UsePrecompiledHeader="2"
WarningLevel="3"
WarnAsError="true"
Expand Down Expand Up @@ -163,12 +163,12 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\Libraries\boost_1_52_0;..\..\..\..\Libraries\mssqlce3.5;&quot;..\..\..\..\Libraries\openssl-1.0.1h\include&quot;;..\..\..\..\Libraries\pgsql8.2.4\include"
AdditionalIncludeDirectories="..\..\..\..\Libraries\boost_1_55_0;..\..\..\..\Libraries\mssqlce3.5;&quot;..\..\..\..\Libraries\openssl-1.0.1h\include&quot;;..\..\..\..\Libraries\pgsql8.2.4\include"
PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;UNICODE;_UNICODE;BOOST_DATE_TIME_NO_LIB"
MinimalRebuild="false"
ExceptionHandling="2"
BasicRuntimeChecks="0"
RuntimeLibrary="1"
RuntimeLibrary="3"
UsePrecompiledHeader="2"
WarningLevel="3"
WarnAsError="true"
Expand Down Expand Up @@ -226,7 +226,7 @@
<Tool
Name="VCPostBuildEventTool"
Description="Performing registration"
CommandLine="copy $(SolutionDir)..\..\..\..\libraries\openssl-1.0.1h\libs\x64\*.dll $(OutDir)&#x0D;&#x0A;&quot;$(TargetPath)&quot; /Register"
CommandLine="copy $(SolutionDir)..\..\..\..\libraries\openssl-1.0.1h\libs\x64\*.dll $(OutDir)&#x0D;&#x0A;&quot;$(TargetPath)&quot; /Register&#x0D;&#x0A;"
/>
</Configuration>
<Configuration
Expand Down Expand Up @@ -268,10 +268,10 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/MP&#x0D;&#x0A;"
AdditionalIncludeDirectories="..\..\..\..\Libraries/boost_1_52_0;..\..\..\..\Libraries\mssqlce3.5;&quot;..\..\..\..\Libraries\openssl-1.0.1h\include&quot;;..\..\..\..\Libraries\pgsql8.2.4\include"
AdditionalIncludeDirectories="..\..\..\..\Libraries/boost_1_55_0;..\..\..\..\Libraries\mssqlce3.5;&quot;..\..\..\..\Libraries\openssl-1.0.1h\include&quot;;..\..\..\..\Libraries\pgsql8.2.4\include"
PreprocessorDefinitions="WIN32;_WINDOWS;UNICODE;_UNICODE;NDEBUG;BOOST_DATE_TIME_NO_LIB"
ExceptionHandling="2"
RuntimeLibrary="0"
RuntimeLibrary="2"
UsePrecompiledHeader="2"
WarningLevel="3"
WarnAsError="false"
Expand Down Expand Up @@ -327,7 +327,7 @@
<Tool
Name="VCPostBuildEventTool"
Description="Performing registration"
CommandLine="copy $(SolutionDir)..\..\..\..\libraries\openssl-1.0.1h\libs\win32\*.dll $(OutDir)&#x0D;&#x0A;&quot;$(TargetPath)&quot; /Register"
CommandLine="copy $(SolutionDir)..\..\..\..\libraries\openssl-1.0.1h\libs\win32\*.dll $(OutDir)&#x0D;&#x0A;&quot;$(TargetPath)&quot; /Register&#x0D;&#x0A;"
/>
</Configuration>
<Configuration
Expand Down Expand Up @@ -369,10 +369,10 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/MP&#x0D;&#x0A;"
AdditionalIncludeDirectories="..\..\..\..\Libraries/boost_1_52_0;..\..\..\..\Libraries\mssqlce3.5;&quot;..\..\..\..\Libraries\openssl-1.0.1h\include&quot;;..\..\..\..\Libraries\pgsql8.2.4\include"
AdditionalIncludeDirectories="..\..\..\..\Libraries/boost_1_55_0;..\..\..\..\Libraries\mssqlce3.5;&quot;..\..\..\..\Libraries\openssl-1.0.1h\include&quot;;..\..\..\..\Libraries\pgsql8.2.4\include"
PreprocessorDefinitions="WIN32;_WINDOWS;UNICODE;_UNICODE;NDEBUG;BOOST_DATE_TIME_NO_LIB"
ExceptionHandling="2"
RuntimeLibrary="0"
RuntimeLibrary="2"
UsePrecompiledHeader="2"
WarningLevel="3"
WarnAsError="false"
Expand Down Expand Up @@ -428,7 +428,63 @@
<Tool
Name="VCPostBuildEventTool"
Description="Performing registration"
CommandLine="copy $(SolutionDir)..\..\..\..\libraries\openssl-1.0.1h\libs\x64\*.dll $(OutDir)&#x0D;&#x0A;&quot;$(TargetPath)&quot; /Register"
CommandLine="copy $(SolutionDir)..\..\..\..\libraries\openssl-1.0.1h\libs\x64\*.dll $(OutDir)&#x0D;&#x0A;&quot;$(TargetPath)&quot; /Register&#x0D;&#x0A;"
/>
</Configuration>
<Configuration
Name="Debug (x64)|Win32"
ConfigurationType="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Expand Down
13 changes: 1 addition & 12 deletions libraries/HOWTO.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,7 @@ Building OpenSSL 1.x
Info:
* Use incl32 include folder.


Building Boost < 1.44
--------------
1) Download Boost
2) Download bjam.exe (separate executable). Put it in Boost\version

http://www.boost.org/users/download/
3) Open a command prompt and navigate to the Boost directory
4) Run bjam.exe --toolset=msvc-9.0 --build-type=complete


Building Boost < 1.45
Building Boost > 1.45
--------------
1) Download Boost
2) Open a command prompt and navigate to the Boost directory
Expand Down
Loading

0 comments on commit dd23470

Please sign in to comment.