FS-6346 --resolve

diff --git a/Freeswitch.2010.sln b/Freeswitch.2010.sln
index c069b069d984386322bd94de7b2a3a0f2e7f9c92..ba3d3b13ae40be235d48905cc387e8db084a0af2 100644 (file)
--- a/Freeswitch.2010.sln
+++ b/Freeswitch.2010.sln
@@ -4056,11 +4056,13 @@ Global
                {3970BCDE-BE1A-4CF3-A65F-5264BA2E47B5}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {3970BCDE-BE1A-4CF3-A65F-5264BA2E47B5}.Debug|Win32.Build.0 = Debug|Win32\r
                {3970BCDE-BE1A-4CF3-A65F-5264BA2E47B5}.Debug|x64.ActiveCfg = Debug|Win32\r
+               {3970BCDE-BE1A-4CF3-A65F-5264BA2E47B5}.Debug|x64.Build.0 = Debug|Win32\r
                {3970BCDE-BE1A-4CF3-A65F-5264BA2E47B5}.Debug|x64 Setup.ActiveCfg = Debug|Win32\r
                {3970BCDE-BE1A-4CF3-A65F-5264BA2E47B5}.Debug|x86 Setup.ActiveCfg = Debug|Win32\r
                {3970BCDE-BE1A-4CF3-A65F-5264BA2E47B5}.Release|Win32.ActiveCfg = Release|Win32\r
                {3970BCDE-BE1A-4CF3-A65F-5264BA2E47B5}.Release|Win32.Build.0 = Release|Win32\r
                {3970BCDE-BE1A-4CF3-A65F-5264BA2E47B5}.Release|x64.ActiveCfg = Release|Win32\r
+               {3970BCDE-BE1A-4CF3-A65F-5264BA2E47B5}.Release|x64.Build.0 = Release|Win32\r
                {3970BCDE-BE1A-4CF3-A65F-5264BA2E47B5}.Release|x64 Setup.ActiveCfg = Release|Win32\r
                {3970BCDE-BE1A-4CF3-A65F-5264BA2E47B5}.Release|x86 Setup.ActiveCfg = Release|Win32\r
        EndGlobalSection\r

diff --git a/Freeswitch.2012.sln b/Freeswitch.2012.sln
index c8dd5e0edd43a3cffaa4474ebf5e1f4eafd84af3..ed394816a9856cf04b94092ff57647a58ab6a62b 100644 (file)
--- a/Freeswitch.2012.sln
+++ b/Freeswitch.2012.sln
@@ -4080,11 +4080,13 @@ Global
                {3970BCDE-BE1A-4CF3-A65F-5264BA2E47B5}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {3970BCDE-BE1A-4CF3-A65F-5264BA2E47B5}.Debug|Win32.Build.0 = Debug|Win32\r
                {3970BCDE-BE1A-4CF3-A65F-5264BA2E47B5}.Debug|x64.ActiveCfg = Debug|Win32\r
+               {3970BCDE-BE1A-4CF3-A65F-5264BA2E47B5}.Debug|x64.Build.0 = Debug|Win32\r
                {3970BCDE-BE1A-4CF3-A65F-5264BA2E47B5}.Debug|x64 Setup.ActiveCfg = Debug|Win32\r
                {3970BCDE-BE1A-4CF3-A65F-5264BA2E47B5}.Debug|x86 Setup.ActiveCfg = Debug|Win32\r
                {3970BCDE-BE1A-4CF3-A65F-5264BA2E47B5}.Release|Win32.ActiveCfg = Release|Win32\r
                {3970BCDE-BE1A-4CF3-A65F-5264BA2E47B5}.Release|Win32.Build.0 = Release|Win32\r
                {3970BCDE-BE1A-4CF3-A65F-5264BA2E47B5}.Release|x64.ActiveCfg = Release|Win32\r
+               {3970BCDE-BE1A-4CF3-A65F-5264BA2E47B5}.Release|x64.Build.0 = Release|Win32\r
                {3970BCDE-BE1A-4CF3-A65F-5264BA2E47B5}.Release|x64 Setup.ActiveCfg = Release|Win32\r
                {3970BCDE-BE1A-4CF3-A65F-5264BA2E47B5}.Release|x86 Setup.ActiveCfg = Release|Win32\r
        EndGlobalSection\r

diff --git a/libs/win32/curl/curllib.2010.vcxproj b/libs/win32/curl/curllib.2010.vcxproj
index f084f16b59b6ba1ca77bee564f603d3404a1c913..4bca13add118cdb76d66a4ef91bf7a7bbb1bc648 100644 (file)
--- 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" />\r
     <ClInclude Include="..\..\curl-7.35.0\lib\urldata.h" />\r
   </ItemGroup>\r
+  <ItemGroup>\r
+    <ProjectReference Include="..\Download CURL.2010.vcxproj">\r
+      <Project>{3970bcde-be1a-4cf3-a65f-5264ba2e47b5}</Project>\r
+    </ProjectReference>\r
+  </ItemGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r
   </ImportGroup>\r

diff --git a/libs/win32/curl/curllib.2010.vcxproj.filters b/libs/win32/curl/curllib.2010.vcxproj.filters
index d2eb3bc1782c01096430fc3987d19842daf1d593..0750894ec7cdf97d3bb6056f31c8992b49bf663f 100644 (file)
--- 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">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\gtls.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
     <ClCompile Include="..\..\curl-7.35.0\lib\hash.c">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\hostares.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
     <ClCompile Include="..\..\curl-7.35.0\lib\hostasyn.c">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
@@ -73,9 +67,6 @@
     <ClCompile Include="..\..\curl-7.35.0\lib\hostsyn.c">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\hostthre.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
     <ClCompile Include="..\..\curl-7.35.0\lib\http.c">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
@@ -88,9 +79,6 @@
     <ClCompile Include="..\..\curl-7.35.0\lib\http_negotiate.c">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\http_ntlm.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
     <ClCompile Include="..\..\curl-7.35.0\lib\if2ip.c">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
@@ -100,9 +88,6 @@
     <ClCompile Include="..\..\curl-7.35.0\lib\inet_pton.c">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\krb4.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
     <ClCompile Include="..\..\curl-7.35.0\lib\ldap.c">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
@@ -151,12 +136,6 @@
     <ClCompile Include="..\..\curl-7.35.0\lib\splay.c">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\sslgen.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\ssluse.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
     <ClCompile Include="..\..\curl-7.35.0\lib\strequal.c">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
@@ -187,6 +166,44 @@
     <ClCompile Include="..\..\curl-7.35.0\lib\version.c">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
+    <ClCompile Include="..\..\curl-7.35.0\lib\asyn-ares.c" />\r
+    <ClCompile Include="..\..\curl-7.35.0\lib\asyn-thread.c" />\r
+    <ClCompile Include="..\..\curl-7.35.0\lib\bundles.c" />\r
+    <ClCompile Include="..\..\curl-7.35.0\lib\conncache.c" />\r
+    <ClCompile Include="..\..\curl-7.35.0\lib\curl_addrinfo.c" />\r
+    <ClCompile Include="..\..\curl-7.35.0\lib\curl_fnmatch.c" />\r
+    <ClCompile Include="..\..\curl-7.35.0\lib\curl_gethostname.c" />\r
+    <ClCompile Include="..\..\curl-7.35.0\lib\curl_gssapi.c" />\r
+    <ClCompile Include="..\..\curl-7.35.0\lib\curl_memrchr.c" />\r
+    <ClCompile Include="..\..\curl-7.35.0\lib\curl_multibyte.c" />\r
+    <ClCompile Include="..\..\curl-7.35.0\lib\curl_ntlm.c" />\r
+    <ClCompile Include="..\..\curl-7.35.0\lib\curl_ntlm_core.c" />\r
+    <ClCompile Include="..\..\curl-7.35.0\lib\curl_ntlm_msgs.c" />\r
+    <ClCompile Include="..\..\curl-7.35.0\lib\curl_ntlm_wb.c" />\r
+    <ClCompile Include="..\..\curl-7.35.0\lib\curl_rtmp.c" />\r
+    <ClCompile Include="..\..\curl-7.35.0\lib\curl_sasl.c" />\r
+    <ClCompile Include="..\..\curl-7.35.0\lib\curl_threads.c" />\r
+    <ClCompile Include="..\..\curl-7.35.0\lib\dotdot.c" />\r
+    <ClCompile Include="..\..\curl-7.35.0\lib\fileinfo.c" />\r
+    <ClCompile Include="..\..\curl-7.35.0\lib\ftplistparser.c" />\r
+    <ClCompile Include="..\..\curl-7.35.0\lib\gopher.c" />\r
+    <ClCompile Include="..\..\curl-7.35.0\lib\hmac.c" />\r
+    <ClCompile Include="..\..\curl-7.35.0\lib\hostcheck.c" />\r
+    <ClCompile Include="..\..\curl-7.35.0\lib\http_proxy.c" />\r
+    <ClCompile Include="..\..\curl-7.35.0\lib\imap.c" />\r
+    <ClCompile Include="..\..\curl-7.35.0\lib\non-ascii.c" />\r
+    <ClCompile Include="..\..\curl-7.35.0\lib\nonblock.c" />\r
+    <ClCompile Include="..\..\curl-7.35.0\lib\pingpong.c" />\r
+    <ClCompile Include="..\..\curl-7.35.0\lib\pipeline.c" />\r
+    <ClCompile Include="..\..\curl-7.35.0\lib\pop3.c" />\r
+    <ClCompile Include="..\..\curl-7.35.0\lib\rawstr.c" />\r
+    <ClCompile Include="..\..\curl-7.35.0\lib\rtsp.c" />\r
+    <ClCompile Include="..\..\curl-7.35.0\lib\slist.c" />\r
+    <ClCompile Include="..\..\curl-7.35.0\lib\smtp.c" />\r
+    <ClCompile Include="..\..\curl-7.35.0\lib\vtls\openssl.c" />\r
+    <ClCompile Include="..\..\curl-7.35.0\lib\vtls\vtls.c" />\r
+    <ClCompile Include="..\..\curl-7.35.0\lib\warnless.c" />\r
+    <ClCompile Include="..\..\curl-7.35.0\lib\wildcard.c" />\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="..\..\curl-7.35.0\lib\arpa_telnet.h">\r
@@ -354,5 +371,6 @@
     <ClInclude Include="..\..\curl-7.35.0\lib\urldata.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="..\..\curl-7.35.0\lib\config-mac.h" />\r
   </ItemGroup>\r
 </Project>
\ No newline at end of file

diff --git a/libs/win32/curl/curllib.2012.vcxproj b/libs/win32/curl/curllib.2012.vcxproj
index edbbf1eee756ab6860b45614cb0463fc97d83ff4..521110c2b70cd3529b6870e6bd5064b0ada6e022 100644 (file)
--- 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" />\r
     <ClInclude Include="..\..\curl-7.35.0\lib\urldata.h" />\r
   </ItemGroup>\r
+  <ItemGroup>\r
+    <ProjectReference Include="..\Download CURL.2012.vcxproj">\r
+      <Project>{3970bcde-be1a-4cf3-a65f-5264ba2e47b5}</Project>\r
+    </ProjectReference>\r
+  </ItemGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r
   </ImportGroup>\r