From 88fda8cbf202359857fcc1c42c5ca58aa29e24a3 Mon Sep 17 00:00:00 2001
From: Jeff Lenk <jeff@jefflenk.com>
Date: Thu, 13 Mar 2014 09:13:30 -0500
Subject: [PATCH] FS-6346 --resolve

---
 Freeswitch.2010.sln                          |  2 +
 Freeswitch.2012.sln                          |  2 +
 libs/win32/curl/curllib.2010.vcxproj         |  5 ++
 libs/win32/curl/curllib.2010.vcxproj.filters | 60 +++++++++++++-------
 libs/win32/curl/curllib.2012.vcxproj         |  5 ++
 5 files changed, 53 insertions(+), 21 deletions(-)

diff --git a/Freeswitch.2010.sln b/Freeswitch.2010.sln
index c069b069d9..ba3d3b13ae 100644
--- a/Freeswitch.2010.sln
+++ b/Freeswitch.2010.sln
@@ -4056,11 +4056,13 @@ Global
 		{3970BCDE-BE1A-4CF3-A65F-5264BA2E47B5}.Debug|Win32.ActiveCfg = Debug|Win32
 		{3970BCDE-BE1A-4CF3-A65F-5264BA2E47B5}.Debug|Win32.Build.0 = Debug|Win32
 		{3970BCDE-BE1A-4CF3-A65F-5264BA2E47B5}.Debug|x64.ActiveCfg = Debug|Win32
+		{3970BCDE-BE1A-4CF3-A65F-5264BA2E47B5}.Debug|x64.Build.0 = Debug|Win32
 		{3970BCDE-BE1A-4CF3-A65F-5264BA2E47B5}.Debug|x64 Setup.ActiveCfg = Debug|Win32
 		{3970BCDE-BE1A-4CF3-A65F-5264BA2E47B5}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{3970BCDE-BE1A-4CF3-A65F-5264BA2E47B5}.Release|Win32.ActiveCfg = Release|Win32
 		{3970BCDE-BE1A-4CF3-A65F-5264BA2E47B5}.Release|Win32.Build.0 = Release|Win32
 		{3970BCDE-BE1A-4CF3-A65F-5264BA2E47B5}.Release|x64.ActiveCfg = Release|Win32
+		{3970BCDE-BE1A-4CF3-A65F-5264BA2E47B5}.Release|x64.Build.0 = Release|Win32
 		{3970BCDE-BE1A-4CF3-A65F-5264BA2E47B5}.Release|x64 Setup.ActiveCfg = Release|Win32
 		{3970BCDE-BE1A-4CF3-A65F-5264BA2E47B5}.Release|x86 Setup.ActiveCfg = Release|Win32
 	EndGlobalSection
diff --git a/Freeswitch.2012.sln b/Freeswitch.2012.sln
index c8dd5e0edd..ed394816a9 100644
--- a/Freeswitch.2012.sln
+++ b/Freeswitch.2012.sln
@@ -4080,11 +4080,13 @@ Global
 		{3970BCDE-BE1A-4CF3-A65F-5264BA2E47B5}.Debug|Win32.ActiveCfg = Debug|Win32
 		{3970BCDE-BE1A-4CF3-A65F-5264BA2E47B5}.Debug|Win32.Build.0 = Debug|Win32
 		{3970BCDE-BE1A-4CF3-A65F-5264BA2E47B5}.Debug|x64.ActiveCfg = Debug|Win32
+		{3970BCDE-BE1A-4CF3-A65F-5264BA2E47B5}.Debug|x64.Build.0 = Debug|Win32
 		{3970BCDE-BE1A-4CF3-A65F-5264BA2E47B5}.Debug|x64 Setup.ActiveCfg = Debug|Win32
 		{3970BCDE-BE1A-4CF3-A65F-5264BA2E47B5}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{3970BCDE-BE1A-4CF3-A65F-5264BA2E47B5}.Release|Win32.ActiveCfg = Release|Win32
 		{3970BCDE-BE1A-4CF3-A65F-5264BA2E47B5}.Release|Win32.Build.0 = Release|Win32
 		{3970BCDE-BE1A-4CF3-A65F-5264BA2E47B5}.Release|x64.ActiveCfg = Release|Win32
+		{3970BCDE-BE1A-4CF3-A65F-5264BA2E47B5}.Release|x64.Build.0 = Release|Win32
 		{3970BCDE-BE1A-4CF3-A65F-5264BA2E47B5}.Release|x64 Setup.ActiveCfg = Release|Win32
 		{3970BCDE-BE1A-4CF3-A65F-5264BA2E47B5}.Release|x86 Setup.ActiveCfg = Release|Win32
 	EndGlobalSection
diff --git a/libs/win32/curl/curllib.2010.vcxproj b/libs/win32/curl/curllib.2010.vcxproj
index f084f16b59..4bca13add1 100644
--- a/libs/win32/curl/curllib.2010.vcxproj
+++ b/libs/win32/curl/curllib.2010.vcxproj
@@ -338,6 +338,11 @@
     <ClInclude Include="..\..\curl-7.35.0\lib\url.h" />
     <ClInclude Include="..\..\curl-7.35.0\lib\urldata.h" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Download CURL.2010.vcxproj">
+      <Project>{3970bcde-be1a-4cf3-a65f-5264ba2e47b5}</Project>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/libs/win32/curl/curllib.2010.vcxproj.filters b/libs/win32/curl/curllib.2010.vcxproj.filters
index d2eb3bc178..0750894ec7 100644
--- a/libs/win32/curl/curllib.2010.vcxproj.filters
+++ b/libs/win32/curl/curllib.2010.vcxproj.filters
@@ -49,15 +49,9 @@
     <ClCompile Include="..\..\curl-7.35.0\lib\getinfo.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\curl-7.35.0\lib\gtls.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\curl-7.35.0\lib\hash.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\curl-7.35.0\lib\hostares.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\curl-7.35.0\lib\hostasyn.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -73,9 +67,6 @@
     <ClCompile Include="..\..\curl-7.35.0\lib\hostsyn.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\curl-7.35.0\lib\hostthre.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\curl-7.35.0\lib\http.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -88,9 +79,6 @@
     <ClCompile Include="..\..\curl-7.35.0\lib\http_negotiate.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\curl-7.35.0\lib\http_ntlm.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\curl-7.35.0\lib\if2ip.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -100,9 +88,6 @@
     <ClCompile Include="..\..\curl-7.35.0\lib\inet_pton.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\curl-7.35.0\lib\krb4.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\curl-7.35.0\lib\ldap.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -151,12 +136,6 @@
     <ClCompile Include="..\..\curl-7.35.0\lib\splay.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\curl-7.35.0\lib\sslgen.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\curl-7.35.0\lib\ssluse.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\curl-7.35.0\lib\strequal.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -187,6 +166,44 @@
     <ClCompile Include="..\..\curl-7.35.0\lib\version.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\curl-7.35.0\lib\asyn-ares.c" />
+    <ClCompile Include="..\..\curl-7.35.0\lib\asyn-thread.c" />
+    <ClCompile Include="..\..\curl-7.35.0\lib\bundles.c" />
+    <ClCompile Include="..\..\curl-7.35.0\lib\conncache.c" />
+    <ClCompile Include="..\..\curl-7.35.0\lib\curl_addrinfo.c" />
+    <ClCompile Include="..\..\curl-7.35.0\lib\curl_fnmatch.c" />
+    <ClCompile Include="..\..\curl-7.35.0\lib\curl_gethostname.c" />
+    <ClCompile Include="..\..\curl-7.35.0\lib\curl_gssapi.c" />
+    <ClCompile Include="..\..\curl-7.35.0\lib\curl_memrchr.c" />
+    <ClCompile Include="..\..\curl-7.35.0\lib\curl_multibyte.c" />
+    <ClCompile Include="..\..\curl-7.35.0\lib\curl_ntlm.c" />
+    <ClCompile Include="..\..\curl-7.35.0\lib\curl_ntlm_core.c" />
+    <ClCompile Include="..\..\curl-7.35.0\lib\curl_ntlm_msgs.c" />
+    <ClCompile Include="..\..\curl-7.35.0\lib\curl_ntlm_wb.c" />
+    <ClCompile Include="..\..\curl-7.35.0\lib\curl_rtmp.c" />
+    <ClCompile Include="..\..\curl-7.35.0\lib\curl_sasl.c" />
+    <ClCompile Include="..\..\curl-7.35.0\lib\curl_threads.c" />
+    <ClCompile Include="..\..\curl-7.35.0\lib\dotdot.c" />
+    <ClCompile Include="..\..\curl-7.35.0\lib\fileinfo.c" />
+    <ClCompile Include="..\..\curl-7.35.0\lib\ftplistparser.c" />
+    <ClCompile Include="..\..\curl-7.35.0\lib\gopher.c" />
+    <ClCompile Include="..\..\curl-7.35.0\lib\hmac.c" />
+    <ClCompile Include="..\..\curl-7.35.0\lib\hostcheck.c" />
+    <ClCompile Include="..\..\curl-7.35.0\lib\http_proxy.c" />
+    <ClCompile Include="..\..\curl-7.35.0\lib\imap.c" />
+    <ClCompile Include="..\..\curl-7.35.0\lib\non-ascii.c" />
+    <ClCompile Include="..\..\curl-7.35.0\lib\nonblock.c" />
+    <ClCompile Include="..\..\curl-7.35.0\lib\pingpong.c" />
+    <ClCompile Include="..\..\curl-7.35.0\lib\pipeline.c" />
+    <ClCompile Include="..\..\curl-7.35.0\lib\pop3.c" />
+    <ClCompile Include="..\..\curl-7.35.0\lib\rawstr.c" />
+    <ClCompile Include="..\..\curl-7.35.0\lib\rtsp.c" />
+    <ClCompile Include="..\..\curl-7.35.0\lib\slist.c" />
+    <ClCompile Include="..\..\curl-7.35.0\lib\smtp.c" />
+    <ClCompile Include="..\..\curl-7.35.0\lib\vtls\openssl.c" />
+    <ClCompile Include="..\..\curl-7.35.0\lib\vtls\vtls.c" />
+    <ClCompile Include="..\..\curl-7.35.0\lib\warnless.c" />
+    <ClCompile Include="..\..\curl-7.35.0\lib\wildcard.c" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\curl-7.35.0\lib\arpa_telnet.h">
@@ -354,5 +371,6 @@
     <ClInclude Include="..\..\curl-7.35.0\lib\urldata.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\curl-7.35.0\lib\config-mac.h" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/libs/win32/curl/curllib.2012.vcxproj b/libs/win32/curl/curllib.2012.vcxproj
index edbbf1eee7..521110c2b7 100644
--- a/libs/win32/curl/curllib.2012.vcxproj
+++ b/libs/win32/curl/curllib.2012.vcxproj
@@ -342,6 +342,11 @@
     <ClInclude Include="..\..\curl-7.35.0\lib\url.h" />
     <ClInclude Include="..\..\curl-7.35.0\lib\urldata.h" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Download CURL.2012.vcxproj">
+      <Project>{3970bcde-be1a-4cf3-a65f-5264ba2e47b5}</Project>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>