Commit 0da8cdf4 authored by Didier LIROULET's avatar Didier LIROULET
Browse files

Update to Zlib 1.2.8, OpenSSL 1.0.0n, cURL 7.37.1, tinyxml 2.6.2

parent 23a99772
......@@ -48,7 +48,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="&quot;..\External_Deps\openssl-1.0.0c\inc32&quot;;&quot;..\External_Deps\curl-7.21.2\include&quot;;..\OcsWmi;..\Sysinfo;&quot;..\OCSInventory Front&quot;;..\External_Deps\tinyxml"
AdditionalIncludeDirectories="..\OcsWmi;..\SysInfo;&quot;..\OCSInventory Front&quot;;..\External_Deps\tinyxml"
PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_BIND_TO_CURRENT_VCLIBS_VERSION"
MinimalRebuild="true"
BasicRuntimeChecks="3"
......@@ -188,7 +188,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="&quot;..\External_Deps\openssl-1.0.0c\inc32&quot;;&quot;..\External_Deps\curl-7.21.2\include&quot;;..\OcsWmi;..\Sysinfo;&quot;..\OCSInventory Front&quot;;..\External_Deps\tinyxml"
AdditionalIncludeDirectories="..\OcsWmi;..\SysInfo;&quot;..\OCSInventory Front&quot;;..\External_Deps\tinyxml"
PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_BIND_TO_CURRENT_VCLIBS_VERSION"
MinimalRebuild="false"
RuntimeLibrary="2"
......
......@@ -47,7 +47,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="&quot;..\External_Deps\zlib-1.2.5&quot;;&quot;..\External_Deps\openssl-1.0.0c\inc32&quot;;&quot;..\\External_Deps\curl-7.21.3\include&quot;;..\OcsWmi;..\Sysinfo;&quot;..\OCSInventory Front&quot;;..\External_Deps\tinyxml"
AdditionalIncludeDirectories="&quot;..\External_Deps\openssl-1.0.0n\inc32&quot;;&quot;..\External_Deps\curl-7.37.1\include&quot;;&quot;..\External_Deps\tinyxml&quot;;&quot;..\OCSInventory Front&quot;;..\OcsWmi;..\SysInfo"
PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL;_AFX_NO_DB_SUPPORT;_AFX_NO_DAO_SUPPORT;_CRT_SECURE_NO_DEPRECATE;_BIND_TO_CURRENT_VCLIBS_VERSION;OCS_PROVIDER_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
......@@ -104,13 +104,8 @@
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
UseOfMFC="2"
CharacterSet="1"
WholeProgramOptimization="1"
Name="Debug|x64"
ConfigurationType="1"
>
<Tool
Name="VCPreBuildEventTool"
......@@ -126,45 +121,21 @@
/>
<Tool
Name="VCMIDLTool"
PreprocessorDefinitions="NDEBUG"
MkTypLibCompatible="false"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="&quot;..\External_Deps\zlib-1.2.5&quot;;&quot;..\External_Deps\openssl-1.0.0c\inc32&quot;;&quot;..\\External_Deps\curl-7.21.3\include&quot;;..\OcsWmi;..\Sysinfo;&quot;..\OCSInventory Front&quot;;..\External_Deps\tinyxml"
PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;_AFX_NO_DB_SUPPORT;_AFX_NO_DAO_SUPPORT;_CRT_SECURE_NO_DEPRECATE;_BIND_TO_CURRENT_VCLIBS_VERSION;OCS_PROVIDER_EXPORTS"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="3"
CallingConvention="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1033"
AdditionalIncludeDirectories="$(IntDir)"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="..\External_Deps\libeay32.lib ..\External_Deps\libcurl_imp.lib"
OutputFile="$(OutDir)\$(ProjectName).dll"
LinkIncremental="1"
ModuleDefinitionFile=""
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
......@@ -189,8 +160,13 @@
/>
</Configuration>
<Configuration
Name="Debug|x64"
ConfigurationType="1"
Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
UseOfMFC="2"
CharacterSet="1"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
......@@ -206,21 +182,45 @@
/>
<Tool
Name="VCMIDLTool"
PreprocessorDefinitions="NDEBUG"
MkTypLibCompatible="false"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="&quot;..\External_Deps\openssl-1.0.0n\inc32&quot;;&quot;..\External_Deps\curl-7.37.1\include&quot;;&quot;..\External_Deps\tinyxml&quot;;&quot;..\OCSInventory Front&quot;;..\OcsWmi;..\SysInfo"
PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;_AFX_NO_DB_SUPPORT;_AFX_NO_DAO_SUPPORT;_CRT_SECURE_NO_DEPRECATE;_BIND_TO_CURRENT_VCLIBS_VERSION;OCS_PROVIDER_EXPORTS"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="3"
CallingConvention="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1033"
AdditionalIncludeDirectories="$(IntDir)"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="..\External_Deps\libeay32.lib ..\External_Deps\libcurl_imp.lib"
OutputFile="$(OutDir)\$(ProjectName).dll"
LinkIncremental="1"
ModuleDefinitionFile=""
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
......@@ -337,7 +337,7 @@
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
......@@ -345,7 +345,7 @@
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
......
......@@ -48,7 +48,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="&quot;..\External_Deps\openssl-1.0.0c\inc32&quot;;&quot;..\External_Deps\curl-7.21.2\include&quot;;..\External_Deps\ZipArchive;..\External_Deps\cmake;..\OcsWmi;..\Sysinfo;&quot;..\OCSInventory Front&quot;;..\External_Deps\tinyxml"
AdditionalIncludeDirectories="..\External_Deps\ZipArchive;..\OcsWmi;..\Sysinfo;&quot;..\OCSInventory Front&quot;;..\External_Deps\tinyxml"
PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_AFX_NO_DB_SUPPORT;_AFX_NO_DAO_SUPPORT;_BIND_TO_CURRENT_VCLIBS_VERSION"
MinimalRebuild="true"
BasicRuntimeChecks="3"
......@@ -101,13 +101,8 @@
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
Name="Debug|x64"
ConfigurationType="1"
UseOfMFC="2"
CharacterSet="1"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
......@@ -123,45 +118,21 @@
/>
<Tool
Name="VCMIDLTool"
PreprocessorDefinitions="NDEBUG"
MkTypLibCompatible="false"
ValidateParameters="true"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="&quot;..\External_Deps\openssl-1.0.0c\inc32&quot;;&quot;..\External_Deps\curl-7.21.2\include&quot;;..\External_Deps\ZipArchive;..\External_Deps\cmake;..\OcsWmi;..\Sysinfo;&quot;..\OCSInventory Front&quot;;..\External_Deps\tinyxml"
PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_AFX_NO_DB_SUPPORT;_AFX_NO_DAO_SUPPORT;_BIND_TO_CURRENT_VCLIBS_VERSION"
MinimalRebuild="false"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1033"
AdditionalIncludeDirectories="$(IntDir)"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="..\External_Deps\ZipArchive.lib"
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
......@@ -186,8 +157,13 @@
/>
</Configuration>
<Configuration
Name="Debug|x64"
Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
UseOfMFC="2"
CharacterSet="1"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
......@@ -203,21 +179,45 @@
/>
<Tool
Name="VCMIDLTool"
PreprocessorDefinitions="NDEBUG"
MkTypLibCompatible="false"
ValidateParameters="true"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\External_Deps\ZipArchive;..\OcsWmi;..\Sysinfo;&quot;..\OCSInventory Front&quot;;..\External_Deps\tinyxml"
PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_AFX_NO_DB_SUPPORT;_AFX_NO_DAO_SUPPORT;_BIND_TO_CURRENT_VCLIBS_VERSION"
MinimalRebuild="false"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1033"
AdditionalIncludeDirectories="$(IntDir)"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="..\External_Deps\ZipArchive.lib"
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
......@@ -330,7 +330,7 @@
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
......@@ -338,7 +338,7 @@
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
......
......@@ -22,13 +22,13 @@ Rem Set path to Perl 5.6 or higher binary
set PERL_PATH=c:\xampp\perl\bin
Rem Set path to Zlib sources
set ZLIB_PATH=D:\Developp\OCS Inventory NG\Bazaar\ocsinventory-windows-agent\External_Deps\zlib-1.2.5
set ZLIB_PATH=D:\Developp\OCS Inventory NG\Bazaar\ocsinventory-windows-agent\External_Deps\zlib-1.2.8
Rem Set path to OpenSSL sources
set OPENSSL_PATH=D:\Developp\OCS Inventory NG\Bazaar\ocsinventory-windows-agent\External_Deps\openssl-1.0.0c
set OPENSSL_PATH=D:\Developp\OCS Inventory NG\Bazaar\ocsinventory-windows-agent\External_Deps\openssl-1.0.0n
Rem Set path to cURL sources
set CURL_PATH=D:\Developp\OCS Inventory NG\Bazaar\ocsinventory-windows-agent\External_Deps\curl-7.21.3
set CURL_PATH=D:\Developp\OCS Inventory NG\Bazaar\ocsinventory-windows-agent\External_Deps\curl-7.37.1
Rem Set path to tinyXML sources
SET XML_PATH=D:\Developp\OCS Inventory NG\Bazaar\ocsinventory-windows-agent\External_Deps\tinyxml
......@@ -140,12 +140,17 @@ echo * *
echo *************************************************************************
echo.
cd "%SNMP_PATH%\win32"
Rem Prepare OpenSSL for Net-SNMP
SET INCLUDE=%INCLUDE%;%OPENSSL_PATH%\inc32
SET LIB=%LIB%;%OPENSSL_PATH%\out32dll
Rem Configure Net-SNMP
perl.exe Configure --linktype=dynamic
perl.exe Configure --with-ssl --linktype=dynamic
if ERRORLEVEL 1 goto ERROR
cd libsnmp_dll
Rem Fix Net-SNMP DLL config for MS Visual C++ with lastest Service Pack ( -D_BIND_TO_CURRENT_VCLIBS_VERSION)
perl.exe -pi.bak -e "s# /D \"WIN32\"# /D \"WIN32\" /D_BIND_TO_CURRENT_VCLIBS_VERSION#g" Makefile
Rem Fix Net-SNMP DLL config for using OpenSSL dynamic library insteadd of static ones
perl.exe -pi.bak -e "s#libeay32MD#libeay32#g" ../net-snmp/net-snmp-config.h
Rem Build Net-SNMP dll
nmake /NOLOGO
if ERRORLEVEL 1 goto ERROR
......
......@@ -47,7 +47,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="&quot;..\External_Deps\zlib-1.2.5&quot;;&quot;..\External_Deps\openssl-1.0.0c\inc32&quot;;..\External_Deps\tinyxml;..\OcsWmi;..\Sysinfo"
AdditionalIncludeDirectories="&quot;..\External_Deps\zlib-1.2.8&quot;;&quot;..\External_Deps\openssl-1.0.0n\inc32&quot;;..\External_Deps\tinyxml;../OcsWmi;..\Sysinfo"
PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL;_AFX_NO_DB_SUPPORT;_AFX_NO_DAO_SUPPORT;_CRT_SECURE_NO_DEPRECATE;_BIND_TO_CURRENT_VCLIBS_VERSION;OCSINVENTORYFRONT_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
......@@ -103,13 +103,8 @@
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
UseOfMFC="2"
CharacterSet="1"
WholeProgramOptimization="1"
Name="Debug|x64"
ConfigurationType="1"
>
<Tool
Name="VCPreBuildEventTool"
......@@ -125,44 +120,21 @@
/>
<Tool
Name="VCMIDLTool"
PreprocessorDefinitions="NDEBUG"
MkTypLibCompatible="false"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="&quot;..\External_Deps\zlib-1.2.5&quot;;&quot;..\External_Deps\openssl-1.0.0c\inc32&quot;;..\External_Deps\tinyxml;..\OcsWmi;..\Sysinfo"
PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;_AFX_NO_DB_SUPPORT;_AFX_NO_DAO_SUPPORT;_CRT_SECURE_NO_DEPRECATE;_BIND_TO_CURRENT_VCLIBS_VERSION;OCSINVENTORYFRONT_EXPORTS"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="3"
CallingConvention="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1033"
AdditionalIncludeDirectories="$(IntDir)"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="..\External_Deps\zdll.lib ..\External_Deps\libeay32.lib WtsApi32.lib Userenv.lib"
LinkIncremental="1"
ModuleDefinitionFile=""
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
......@@ -187,8 +159,13 @@
/>
</Configuration>
<Configuration
Name="Debug|x64"
ConfigurationType="1"
Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
UseOfMFC="2"
CharacterSet="1"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
......@@ -204,21 +181,44 @@
/>
<Tool
Name="VCMIDLTool"
PreprocessorDefinitions="NDEBUG"
MkTypLibCompatible="false"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="&quot;..\External_Deps\zlib-1.2.8&quot;;&quot;..\External_Deps\openssl-1.0.0n\inc32&quot;;..\External_Deps\tinyxml;../OcsWmi;..\Sysinfo"
PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;_AFX_NO_DB_SUPPORT;_AFX_NO_DAO_SUPPORT;_CRT_SECURE_NO_DEPRECATE;_BIND_TO_CURRENT_VCLIBS_VERSION;OCSINVENTORYFRONT_EXPORTS"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="3"
CallingConvention="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1033"
AdditionalIncludeDirectories="$(IntDir)"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="..\External_Deps\zdll.lib ..\External_Deps\libeay32.lib WtsApi32.lib Userenv.lib"
LinkIncremental="1"
ModuleDefinitionFile=""
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
......@@ -431,7 +431,7 @@
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
......@@ -439,7 +439,7 @@
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
......
......@@ -49,7 +49,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="&quot;..\External_Deps\openssl-1.0.0c\inc32&quot;;&quot;..\External_Deps\curl-7.21.2\include&quot;;..\OcsWmi;..\Sysinfo;&quot;..\OCSInventory Front&quot;;..\External_Deps\tinyxml;..\Agent"
AdditionalIncludeDirectories="..\OcsWmi;..\Sysinfo;&quot;..\OCSInventory Front&quot;;..\External_Deps\tinyxml;..\Agent"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_BIND_TO_CURRENT_VCLIBS_VERSION"
MinimalRebuild="true"
BasicRuntimeChecks="3"
......@@ -150,7 +150,7 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="&quot;..\External_Deps\openssl-1.0.0c\inc32&quot;;&quot;..\External_Deps\curl-7.21.2\include&quot;;..\OcsWmi;..\Sysinfo;&quot;..\OCSInventory Front&quot;;..\External_Deps\tinyxml;..\Agent"
AdditionalIncludeDirectories="..\OcsWmi;..\Sysinfo;&quot;..\OCSInventory Front&quot;;..\External_Deps\tinyxml;..\Agent"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_BIND_TO_CURRENT_VCLIBS_VERSION"
StringPooling="true"
RuntimeLibrary="2"
......
......@@ -45,7 +45,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="&quot;..\External_Deps\openssl-1.0.0c\inc32&quot;;&quot;..\External_Deps\curl-7.21.2\include&quot;;..\External_Deps\ZipArchive;..\External_Deps\cmake;..\OcsWmi;..\Sysinfo;&quot;..\OCSInventory Front&quot;;..\External_Deps\tinyxml"
AdditionalIncludeDirectories="..\OcsWmi;..\Sysinfo;&quot;..\OCSInventory Front&quot;;..\External_Deps\tinyxml"
PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_AFX_NO_DB_SUPPORT;_AFX_NO_DAO_SUPPORT;_CRT_SECURE_NO_DEPRECATE;_BIND_TO_CURRENT_VCLIBS_VERSION"
MinimalRebuild="true"
BasicRuntimeChecks="3"
......@@ -126,7 +126,7 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="&quot;..\External_Deps\openssl-1.0.0c\inc32&quot;;&quot;..\External_Deps\curl-7.21.2\include&quot;;..\External_Deps\ZipArchive;..\External_Deps\cmake;..\OcsWmi;..\Sysinfo;&quot;..\OCSInventory Front&quot;;..\External_Deps\tinyxml"
AdditionalIncludeDirectories="..\OcsWmi;..\Sysinfo;&quot;..\OCSInventory Front&quot;;..\External_Deps\tinyxml"
PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_AFX_NO_DB_SUPPORT;_AFX_NO_DAO_SUPPORT;_CRT_SECURE_NO_DEPRECATE;_BIND_TO_CURRENT_VCLIBS_VERSION"
MinimalRebuild="false"
RuntimeLibrary="2"
......
......@@ -45,7 +45,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="&quot;..\External_Deps\openssl-1.0.0c\inc32&quot;;&quot;..\External_Deps\curl-7.21.2\include&quot;;..\OcsWmi;..\Sysinfo;&quot;..\OCSInventory Front&quot;;..\External_Deps\tinyxml"
AdditionalIncludeDirectories="&quot;..\External_Deps\openssl-1.0.0n\inc32&quot;;..\External_Deps\ZipArchive;..\OcsWmi;..\Sysinfo;&quot;..\OCSInventory Front&quot;;..\External_Deps\tinyxml"
PreprocessorDefinitions="WIN32;_CONSOLE;_DEBUG;_BIND_TO_CURRENT_VCLIBS_VERSION"
MinimalRebuild="true"
BasicRuntimeChecks="3"
......@@ -179,7 +179,7 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="&quot;..\External_Deps\openssl-1.0.0c\inc32&quot;;&quot;..\External_Deps\curl-7.21.2\include&quot;;..\OcsWmi;..\Sysinfo;&quot;..\OCSInventory Front&quot;;..\External_Deps\tinyxml"
AdditionalIncludeDirectories="&quot;..\External_Deps\openssl-1.0.0n\inc32&quot;;..\External_Deps\ZipArchive;..\OcsWmi;..\Sysinfo;&quot;..\OCSInventory Front&quot;;..\External_Deps\tinyxml"
PreprocessorDefinitions="WIN32;_CONSOLE;NDEBUG;_BIND_TO_CURRENT_VCLIBS_VERSION"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
......
......@@ -47,7 +47,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\OcsWmi;&quot;..\External_Deps\openssl-1.0.0c\inc32&quot;"
AdditionalIncludeDirectories="..\OcsWmi;&quot;..\External_Deps\openssl-1.0.0n\inc32&quot;"
PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL;_AFX_NO_DB_SUPPORT;_AFX_NO_DAO_SUPPORT;_CRT_SECURE_NO_DEPRECATE;_BIND_TO_CURRENT_VCLIBS_VERSION;SYSINFO_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
......@@ -103,13 +103,8 @@
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
UseOfMFC="2"
CharacterSet="1"
WholeProgramOptimization="1"
Name="Debug|x64"
ConfigurationType="1"
>
<Tool
Name="VCPreBuildEventTool"
......@@ -125,44 +120,21 @@
/>
<Tool
Name="VCMIDLTool"
PreprocessorDefinitions="NDEBUG"
MkTypLibCompatible="false"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\OcsWmi;&quot;..\External_Deps\openssl-1.0.0c\inc32&quot;"
PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;_AFX_NO_DB_SUPPORT;_AFX_NO_DAO_SUPPORT;_CRT_SECURE_NO_DEPRECATE;_BIND_TO_CURRENT_VCLIBS_VERSION;SYSINFO_EXPORTS"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="3"
CallingConvention="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1033"
AdditionalIncludeDirectories="$(IntDir)"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="..\External_Deps\libeay32.lib wbemuuid.lib"
LinkIncremental="1"
ModuleDefinitionFile=""
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
......@@ -187,8 +159,13 @@
/>
</Configuration>
<Configuration
Name="Debug|x64"
ConfigurationType="1"
Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
UseOfMFC="2"
CharacterSet="1"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
......@@ -204,21 +181,44 @@
/>
<Tool
Name="VCMIDLTool"
PreprocessorDefinitions="NDEBUG"
MkTypLibCompatible="false"
/>