vs2010 add some ssl support to curl - test

diff --git a/libs/win32/curl/curllib.2010.vcxproj b/libs/win32/curl/curllib.2010.vcxproj
index 979093e95829a75f739b7928ef74f07cd14ca20b..c607e0198aa1cd236cdcc2fb092e77ff825cdbb8 100644 (file)
--- a/libs/win32/curl/curllib.2010.vcxproj
+++ b/libs/win32/curl/curllib.2010.vcxproj
@@ -80,8 +80,8 @@
     <ClCompile>\r
       <Optimization>MaxSpeed</Optimization>\r
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
-      <AdditionalIncludeDirectories>..\..\curl\lib\;..\..\curl\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <AdditionalIncludeDirectories>..\..\curl\lib\;..\..\curl\include;.;..\..\openssl-1.0.0a\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL;USE_SSLEAY;USE_OPENSSL;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <StringPooling>true</StringPooling>\r
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
@@ -111,8 +111,8 @@
     <ClCompile>\r
       <Optimization>MaxSpeed</Optimization>\r
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
-      <AdditionalIncludeDirectories>..\..\curl\lib\;..\..\curl\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <AdditionalIncludeDirectories>..\..\curl\lib\;..\..\curl\include;.;..\..\openssl-1.0.0a\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL;USE_SSLEAY;USE_OPENSSL;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <StringPooling>true</StringPooling>\r
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
@@ -141,8 +141,8 @@
     </Midl>\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>..\..\curl\lib\;..\..\curl\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <AdditionalIncludeDirectories>..\..\curl\lib\;..\..\curl\include;.;..\..\openssl-1.0.0a\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL;USE_SSLEAY;USE_OPENSSL;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <MinimalRebuild>true</MinimalRebuild>\r
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
@@ -171,8 +171,8 @@
     </Midl>\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>..\..\curl\lib\;..\..\curl\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <AdditionalIncludeDirectories>..\..\curl\lib\;..\..\curl\include;.;..\..\openssl-1.0.0a\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL;USE_SSLEAY;USE_OPENSSL;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <MinimalRebuild>true</MinimalRebuild>\r
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r

diff --git a/src/mod/applications/mod_curl/mod_curl.2010.vcxproj b/src/mod/applications/mod_curl/mod_curl.2010.vcxproj
index dd7ea67bd0be3494df05f353d18c6b30f22cbd77..45257322b9f25b94e34e7916580c416f3319eec0 100644 (file)
--- a/src/mod/applications/mod_curl/mod_curl.2010.vcxproj
+++ b/src/mod/applications/mod_curl/mod_curl.2010.vcxproj
@@ -136,6 +136,12 @@
       <Project>{9778f1c0-09bc-4698-8ebc-bd982247209a}</Project>\r
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\r
     </ProjectReference>\r
+    <ProjectReference Include="..\..\..\..\libs\win32\openssl\libeay32.2010.vcxproj">\r
+      <Project>{d331904d-a00a-4694-a5a3-fcff64ab5dbe}</Project>\r
+    </ProjectReference>\r
+    <ProjectReference Include="..\..\..\..\libs\win32\openssl\ssleay32.2010.vcxproj">\r
+      <Project>{b4b62169-5ad4-4559-8707-3d933ac5db39}</Project>\r
+    </ProjectReference>\r
     <ProjectReference Include="..\..\..\..\w32\Library\FreeSwitchCore.2010.vcxproj">\r
       <Project>{202d7a4e-760d-4d0e-afa1-d7459ced30ff}</Project>\r
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\r

diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey_curl.2010.vcxproj b/src/mod/languages/mod_spidermonkey/mod_spidermonkey_curl.2010.vcxproj
index 9bcd25813e04964c20c7c5d02360c3dff19aa8ef..9dbcd29cfc07a49c4a732d7f523f708e892a9245 100644 (file)
--- a/src/mod/languages/mod_spidermonkey/mod_spidermonkey_curl.2010.vcxproj
+++ b/src/mod/languages/mod_spidermonkey/mod_spidermonkey_curl.2010.vcxproj
@@ -166,6 +166,12 @@
       <Project>{204fa0de-305d-4414-ae2e-f195a23f390d}</Project>\r
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\r
     </ProjectReference>\r
+    <ProjectReference Include="..\..\..\..\libs\win32\openssl\libeay32.2010.vcxproj">\r
+      <Project>{d331904d-a00a-4694-a5a3-fcff64ab5dbe}</Project>\r
+    </ProjectReference>\r
+    <ProjectReference Include="..\..\..\..\libs\win32\openssl\ssleay32.2010.vcxproj">\r
+      <Project>{b4b62169-5ad4-4559-8707-3d933ac5db39}</Project>\r
+    </ProjectReference>\r
     <ProjectReference Include="..\..\..\..\w32\Library\FreeSwitchCore.2010.vcxproj">\r
       <Project>{202d7a4e-760d-4d0e-afa1-d7459ced30ff}</Project>\r
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\r

diff --git a/src/mod/xml_int/mod_xml_curl/mod_xml_curl.2010.vcxproj b/src/mod/xml_int/mod_xml_curl/mod_xml_curl.2010.vcxproj
index 0d30ff34893f4486bcb0d2707e62fe1a553b1ac4..d5d3af69f099c165e446d1f5d761c3503b8dfa2f 100644 (file)
--- a/src/mod/xml_int/mod_xml_curl/mod_xml_curl.2010.vcxproj
+++ b/src/mod/xml_int/mod_xml_curl/mod_xml_curl.2010.vcxproj
@@ -136,6 +136,12 @@
       <Project>{87ee9da4-de1e-4448-8324-183c98dca588}</Project>\r
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\r
     </ProjectReference>\r
+    <ProjectReference Include="..\..\..\..\libs\win32\openssl\libeay32.2010.vcxproj">\r
+      <Project>{d331904d-a00a-4694-a5a3-fcff64ab5dbe}</Project>\r
+    </ProjectReference>\r
+    <ProjectReference Include="..\..\..\..\libs\win32\openssl\ssleay32.2010.vcxproj">\r
+      <Project>{b4b62169-5ad4-4559-8707-3d933ac5db39}</Project>\r
+    </ProjectReference>\r
     <ProjectReference Include="..\..\..\..\w32\Library\FreeSwitchCore.2010.vcxproj">\r
       <Project>{202d7a4e-760d-4d0e-afa1-d7459ced30ff}</Project>\r
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\r

diff --git a/w32/Library/FreeSwitchCore.2010.vcxproj b/w32/Library/FreeSwitchCore.2010.vcxproj
index aa03a0b49a767022794250adcea84db033070d1a..7cb47d30ba405b649323b5e83d896605d8f50114 100644 (file)
--- a/w32/Library/FreeSwitchCore.2010.vcxproj
+++ b/w32/Library/FreeSwitchCore.2010.vcxproj
@@ -792,6 +792,12 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
     <ProjectReference Include="..\..\libs\win32\curl\curllib.2010.vcxproj">\r
       <Project>{87ee9da4-de1e-4448-8324-183c98dca588}</Project>\r
     </ProjectReference>\r
+    <ProjectReference Include="..\..\libs\win32\openssl\libeay32.2010.vcxproj">\r
+      <Project>{d331904d-a00a-4694-a5a3-fcff64ab5dbe}</Project>\r
+    </ProjectReference>\r
+    <ProjectReference Include="..\..\libs\win32\openssl\ssleay32.2010.vcxproj">\r
+      <Project>{b4b62169-5ad4-4559-8707-3d933ac5db39}</Project>\r
+    </ProjectReference>\r
     <ProjectReference Include="..\..\libs\win32\pcre\libpcre.2010.vcxproj">\r
       <Project>{8d04b550-d240-4a44-8a18-35da3f7038d9}</Project>\r
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\r