]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-11085: [Build-System] Update curl to 7.59.0 and move to pre-compiled binaries...
authorAndrey Volk <andywolk@gmail.com>
Sat, 31 Mar 2018 18:59:02 +0000 (21:59 +0300)
committerMuteesa Fred <muteesafred@hotmail.com>
Tue, 24 Jul 2018 07:21:46 +0000 (07:21 +0000)
19 files changed:
Freeswitch.2015.sln
libs/.gitignore
libs/win32/Download CURL.2015.vcxproj [deleted file]
libs/win32/curl/ca-bundle.h [deleted file]
libs/win32/curl/cleancount [deleted file]
libs/win32/curl/curllib.2010.vcxproj.filters [deleted file]
libs/win32/curl/curllib.2015.vcxproj [deleted file]
src/mod/applications/mod_curl/mod_curl.2015.vcxproj
src/mod/applications/mod_http_cache/mod_http_cache.vcxproj
src/mod/formats/mod_shout/mod_shout.2015.vcxproj
src/mod/languages/mod_v8/mod_v8.2015.vcxproj
src/mod/languages/mod_v8/mod_v8_skel.2015.vcxproj
src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.2015.vcxproj
src/mod/xml_int/mod_xml_curl/mod_xml_curl.2015.vcxproj
w32/Library/FreeSwitchCore.2015.vcxproj
w32/curl-version.props
w32/curl.props
w32/openssl.props
w32/zlib.props

index 01997507389513d9024d6dd25cf0bfba713c638a..b15ca7c65a58438174d9f9a74cc86e5863ea4ca4 100644 (file)
@@ -238,8 +238,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iksemel", "libs\win32\iksem
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsndfile", "libs\win32\libsndfile\libsndfile.2015.vcxproj", "{3D0370CA-BED2-4657-A475-32375CBCB6E4}"\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "curllib", "libs\win32\curl\curllib.2015.vcxproj", "{87EE9DA4-DE1E-4448-8324-183C98DCA588}"\r
-EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml", "libs\win32\apr-util\xml.2015.vcxproj", "{155844C3-EC5F-407F-97A4-A2DDADED9B2F}"\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_sofia", "src\mod\endpoints\mod_sofia\mod_sofia.2015.vcxproj", "{0DF3ABD0-DDC0-4265-B778-07C66780979B}"\r
@@ -563,8 +561,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_t43_gray_code_tables",
 EndProject\r
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "winFailToBan", "src\mod\languages\mod_managed\managed\examples\winFailToBan\winFailToBan.csproj", "{5BA0D5BD-330D-4EE2-B959-CAFEA04E50E0}"\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download CURL", "libs\win32\Download CURL.2015.vcxproj", "{3970BCDE-BE1A-4CF3-A65F-5264BA2E47B5}"\r
-EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download PCRE", "libs\win32\Download PCRE.2015.vcxproj", "{B1E7E876-347F-4DC9-9BEA-D1AFBD9DFF8A}"\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download SPEEX", "libs\win32\Download SPEEX.2015.vcxproj", "{1BDAB935-27DC-47E3-95EA-17E024D39C31}"\r
@@ -1003,17 +999,6 @@ Global
                {3D0370CA-BED2-4657-A475-32375CBCB6E4}.Release|Win32.Build.0 = Release|Win32\r
                {3D0370CA-BED2-4657-A475-32375CBCB6E4}.Release|x64.ActiveCfg = Release|x64\r
                {3D0370CA-BED2-4657-A475-32375CBCB6E4}.Release|x64.Build.0 = Release|x64\r
-               {87EE9DA4-DE1E-4448-8324-183C98DCA588}.All|Win32.ActiveCfg = Debug|x64\r
-               {87EE9DA4-DE1E-4448-8324-183C98DCA588}.All|x64.ActiveCfg = Debug|x64\r
-               {87EE9DA4-DE1E-4448-8324-183C98DCA588}.All|x64.Build.0 = Debug|x64\r
-               {87EE9DA4-DE1E-4448-8324-183C98DCA588}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {87EE9DA4-DE1E-4448-8324-183C98DCA588}.Debug|Win32.Build.0 = Debug|Win32\r
-               {87EE9DA4-DE1E-4448-8324-183C98DCA588}.Debug|x64.ActiveCfg = Debug|x64\r
-               {87EE9DA4-DE1E-4448-8324-183C98DCA588}.Debug|x64.Build.0 = Debug|x64\r
-               {87EE9DA4-DE1E-4448-8324-183C98DCA588}.Release|Win32.ActiveCfg = Release|Win32\r
-               {87EE9DA4-DE1E-4448-8324-183C98DCA588}.Release|Win32.Build.0 = Release|Win32\r
-               {87EE9DA4-DE1E-4448-8324-183C98DCA588}.Release|x64.ActiveCfg = Release|x64\r
-               {87EE9DA4-DE1E-4448-8324-183C98DCA588}.Release|x64.Build.0 = Release|x64\r
                {155844C3-EC5F-407F-97A4-A2DDADED9B2F}.All|Win32.ActiveCfg = Debug|x64\r
                {155844C3-EC5F-407F-97A4-A2DDADED9B2F}.All|x64.ActiveCfg = Debug|x64\r
                {155844C3-EC5F-407F-97A4-A2DDADED9B2F}.All|x64.Build.0 = Debug|x64\r
@@ -2582,17 +2567,6 @@ Global
                {5BA0D5BD-330D-4EE2-B959-CAFEA04E50E0}.Debug|x64.ActiveCfg = Debug|Any CPU\r
                {5BA0D5BD-330D-4EE2-B959-CAFEA04E50E0}.Release|Win32.ActiveCfg = Release|Any CPU\r
                {5BA0D5BD-330D-4EE2-B959-CAFEA04E50E0}.Release|x64.ActiveCfg = Release|Any CPU\r
-               {3970BCDE-BE1A-4CF3-A65F-5264BA2E47B5}.All|Win32.ActiveCfg = Release|Win32\r
-               {3970BCDE-BE1A-4CF3-A65F-5264BA2E47B5}.All|Win32.Build.0 = Release|Win32\r
-               {3970BCDE-BE1A-4CF3-A65F-5264BA2E47B5}.All|x64.ActiveCfg = Release|Win32\r
-               {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}.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
                {B1E7E876-347F-4DC9-9BEA-D1AFBD9DFF8A}.All|Win32.ActiveCfg = Release|Win32\r
                {B1E7E876-347F-4DC9-9BEA-D1AFBD9DFF8A}.All|Win32.Build.0 = Release|Win32\r
                {B1E7E876-347F-4DC9-9BEA-D1AFBD9DFF8A}.All|x64.ActiveCfg = Release|Win32\r
@@ -3099,7 +3073,6 @@ Global
                {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}\r
                {E727E8F6-935D-46FE-8B0E-37834748A0E3} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}\r
                {3D0370CA-BED2-4657-A475-32375CBCB6E4} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}\r
-               {87EE9DA4-DE1E-4448-8324-183C98DCA588} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}\r
                {155844C3-EC5F-407F-97A4-A2DDADED9B2F} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}\r
                {0DF3ABD0-DDC0-4265-B778-07C66780979B} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C}\r
                {8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A} = {C120A020-773F-4EA3-923F-B67AF28B750D}\r
@@ -3245,7 +3218,6 @@ Global
                {64E99CCA-3C6F-4AEB-9FA3-CFAC711257BB} = {F881ADA2-2F1A-4046-9FEB-191D9422D781}\r
                {EDDB8AB9-C53E-44C0-A620-0E86C2CBD5D5} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}\r
                {5BA0D5BD-330D-4EE2-B959-CAFEA04E50E0} = {0C808854-54D1-4230-BFF5-77B5FD905000}\r
-               {3970BCDE-BE1A-4CF3-A65F-5264BA2E47B5} = {C120A020-773F-4EA3-923F-B67AF28B750D}\r
                {B1E7E876-347F-4DC9-9BEA-D1AFBD9DFF8A} = {C120A020-773F-4EA3-923F-B67AF28B750D}\r
                {1BDAB935-27DC-47E3-95EA-17E024D39C31} = {C120A020-773F-4EA3-923F-B67AF28B750D}\r
                {97D25665-34CD-4E0C-96E7-88F0795B8883} = {C120A020-773F-4EA3-923F-B67AF28B750D}\r
index 79dbc2ca7a6b04da006023577e5fa03e67452e7b..ad93a4dbe7b0b44caed05d84f08b25a69ee710e8 100644 (file)
@@ -848,3 +848,5 @@ libpq-*/
 libpq-*
 lua-*/
 lua-*
+curl-*/
+curl-*
diff --git a/libs/win32/Download CURL.2015.vcxproj b/libs/win32/Download CURL.2015.vcxproj
deleted file mode 100644 (file)
index fcdcfee..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <ItemGroup Label="ProjectConfigurations">\r
-    <ProjectConfiguration Include="Debug|Win32">\r
-      <Configuration>Debug</Configuration>\r
-      <Platform>Win32</Platform>\r
-    </ProjectConfiguration>\r
-    <ProjectConfiguration Include="Release|Win32">\r
-      <Configuration>Release</Configuration>\r
-      <Platform>Win32</Platform>\r
-    </ProjectConfiguration>\r
-  </ItemGroup>\r
-  <PropertyGroup Label="Globals">\r
-    <ProjectName>Download CURL</ProjectName>\r
-    <ProjectGuid>{3970BCDE-BE1A-4CF3-A65F-5264BA2E47B5}</ProjectGuid>\r
-    <RootNamespace>Download CURL</RootNamespace>\r
-    <Keyword>Win32Proj</Keyword>\r
-  </PropertyGroup>\r
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
-    <ConfigurationType>Utility</ConfigurationType>\r
-    <CharacterSet>MultiByte</CharacterSet>\r
-    <PlatformToolset>v140</PlatformToolset>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
-    <ConfigurationType>Utility</ConfigurationType>\r
-    <CharacterSet>MultiByte</CharacterSet>\r
-    <PlatformToolset>v140</PlatformToolset>\r
-  </PropertyGroup>\r
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
-  <Import Project="$(SolutionDir)\w32\extdll.props" />\r
-  <Import Project="$(SolutionDir)\w32\curl-version.props" />\r
-  <ImportGroup Label="ExtensionSettings">\r
-  </ImportGroup>\r
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">\r
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-  </ImportGroup>\r
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">\r
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-  </ImportGroup>\r
-  <PropertyGroup Label="UserMacros" />\r
-  <PropertyGroup>\r
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(PlatformName)\CURL\$(Configuration)\</IntDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(PlatformName)\CURL\$(Configuration)\</IntDir>\r
-  </PropertyGroup>\r
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
-    <BuildLog>\r
-      <Path>$(IntDir)BuildLog $(ProjectName).htm</Path>\r
-    </BuildLog>\r
-    <PreBuildEvent>\r
-      <Command>\r
-      </Command>\r
-    </PreBuildEvent>\r
-  </ItemDefinitionGroup>\r
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
-    <BuildLog>\r
-      <Path>$(IntDir)BuildLog $(ProjectName).htm</Path>\r
-    </BuildLog>\r
-    <PreBuildEvent>\r
-      <Command>\r
-      </Command>\r
-    </PreBuildEvent>\r
-    <PostBuildEvent>\r
-      <Command>\r
-      </Command>\r
-    </PostBuildEvent>\r
-  </ItemDefinitionGroup>\r
-  <ItemGroup>\r
-    <CustomBuild Include="cleancount">\r
-      <FileType>Document</FileType>\r
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Downloading Curl.</Message>\r
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">if not exist "$(ProjectDir)..\curl-$(cURL_Version)" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/curl-$(cURL_Version).tar.gz "$(ProjectDir).."\r
-</Command>\r
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\curl-$(cURL_Version);%(Outputs)</Outputs>\r
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Downloading Curl.</Message>\r
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">if not exist "$(ProjectDir)..\curl-$(cURL_Version)" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/curl-$(cURL_Version).tar.gz "$(ProjectDir).."\r
-</Command>\r
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)..\curl-$(cURL_Version);%(Outputs)</Outputs>\r
-    </CustomBuild>\r
-  </ItemGroup>\r
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
-  <ImportGroup Label="ExtensionTargets">\r
-  </ImportGroup>\r
-</Project>
\ No newline at end of file
diff --git a/libs/win32/curl/ca-bundle.h b/libs/win32/curl/ca-bundle.h
deleted file mode 100644 (file)
index 12390bc..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/* ca bundle path set in here*/
diff --git a/libs/win32/curl/cleancount b/libs/win32/curl/cleancount
deleted file mode 100644 (file)
index 56a6051..0000000
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file
diff --git a/libs/win32/curl/curllib.2010.vcxproj.filters b/libs/win32/curl/curllib.2010.vcxproj.filters
deleted file mode 100644 (file)
index c5e79c5..0000000
+++ /dev/null
@@ -1,340 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <ItemGroup>\r
-    <Filter Include="Source Files">\r
-      <UniqueIdentifier>{6b959500-cd81-4335-bdf2-c430b2f07328}</UniqueIdentifier>\r
-    </Filter>\r
-    <Filter Include="Header Files">\r
-      <UniqueIdentifier>{ee1686be-f512-40e0-8f5e-76480b95aafc}</UniqueIdentifier>\r
-    </Filter>\r
-    <Filter Include="Resource Files">\r
-      <UniqueIdentifier>{fd722a55-89b7-4153-9226-3eec445000d1}</UniqueIdentifier>\r
-      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>\r
-    </Filter>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\base64.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\connect.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\content_encoding.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\cookie.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\dict.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\easy.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\escape.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\file.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\formdata.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\ftp.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\getenv.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\getinfo.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\hostasyn.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\hostip.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\hostip4.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\hostip6.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\hostsyn.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
-    <ClCompile Include="..\..\curl-7.35.0\lib\http_chunks.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\http_digest.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <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\if2ip.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\inet_ntop.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <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\ldap.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\llist.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\md5.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\memdebug.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\mprintf.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\multi.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\netrc.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\parsedate.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\progress.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\security.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\select.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\sendf.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\share.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\socks.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\speedcheck.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\splay.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
-    <ClCompile Include="..\..\curl-7.35.0\lib\strerror.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\strtok.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\strtoofft.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\telnet.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\tftp.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\timeval.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\transfer.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\url.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <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
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\config-win32.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\connect.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\content_encoding.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\cookie.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\curlx.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\dict.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\easyif.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\escape.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\file.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\formdata.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\ftp.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\getinfo.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\hash.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\hostip.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\http.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\http_chunks.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\http_digest.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\http_negotiate.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\if2ip.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\inet_ntop.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\inet_pton.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\llist.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\memdebug.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\multiif.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\netrc.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\parsedate.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\progress.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\select.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\sendf.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\share.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\sockaddr.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\speedcheck.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\strequal.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\strerror.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\strtok.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\strtoofft.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\telnet.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\tftp.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\timeval.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\transfer.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\url.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <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.2015.vcxproj b/libs/win32/curl/curllib.2015.vcxproj
deleted file mode 100644 (file)
index 4767430..0000000
+++ /dev/null
@@ -1,450 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <ItemGroup Label="ProjectConfigurations">\r
-    <ProjectConfiguration Include="Debug|Win32">\r
-      <Configuration>Debug</Configuration>\r
-      <Platform>Win32</Platform>\r
-    </ProjectConfiguration>\r
-    <ProjectConfiguration Include="Debug|x64">\r
-      <Configuration>Debug</Configuration>\r
-      <Platform>x64</Platform>\r
-    </ProjectConfiguration>\r
-    <ProjectConfiguration Include="Release|Win32">\r
-      <Configuration>Release</Configuration>\r
-      <Platform>Win32</Platform>\r
-    </ProjectConfiguration>\r
-    <ProjectConfiguration Include="Release|x64">\r
-      <Configuration>Release</Configuration>\r
-      <Platform>x64</Platform>\r
-    </ProjectConfiguration>\r
-  </ItemGroup>\r
-  <PropertyGroup Label="Globals">\r
-    <ProjectName>curllib</ProjectName>\r
-    <ProjectGuid>{87EE9DA4-DE1E-4448-8324-183C98DCA588}</ProjectGuid>\r
-    <RootNamespace>curllib</RootNamespace>\r
-  </PropertyGroup>\r
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
-    <ConfigurationType>StaticLibrary</ConfigurationType>\r
-    <UseOfMfc>false</UseOfMfc>\r
-    <CharacterSet>MultiByte</CharacterSet>\r
-    <PlatformToolset>v140</PlatformToolset>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
-    <ConfigurationType>StaticLibrary</ConfigurationType>\r
-    <UseOfMfc>false</UseOfMfc>\r
-    <CharacterSet>MultiByte</CharacterSet>\r
-    <PlatformToolset>v140</PlatformToolset>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">\r
-    <ConfigurationType>StaticLibrary</ConfigurationType>\r
-    <UseOfMfc>false</UseOfMfc>\r
-    <CharacterSet>MultiByte</CharacterSet>\r
-    <PlatformToolset>v140</PlatformToolset>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">\r
-    <ConfigurationType>StaticLibrary</ConfigurationType>\r
-    <UseOfMfc>false</UseOfMfc>\r
-    <CharacterSet>MultiByte</CharacterSet>\r
-    <PlatformToolset>v140</PlatformToolset>\r
-  </PropertyGroup>\r
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
-  <Import Project="$(SolutionDir)\w32\curl-version.props" />\r
-  <Import Project="..\..\..\w32\openssl.props" />\r
-  <ImportGroup Label="ExtensionSettings">\r
-  </ImportGroup>\r
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">\r
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-    <Import Project="..\..\..\w32\extlib.props" />\r
-  </ImportGroup>\r
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">\r
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-    <Import Project="..\..\..\w32\extlib.props" />\r
-  </ImportGroup>\r
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">\r
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-    <Import Project="..\..\..\w32\extlib.props" />\r
-  </ImportGroup>\r
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">\r
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-    <Import Project="..\..\..\w32\extlib.props" />\r
-  </ImportGroup>\r
-  <PropertyGroup Label="UserMacros" />\r
-  <PropertyGroup>\r
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
-  </PropertyGroup>\r
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
-    <Midl>\r
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <MkTypLibCompatible>true</MkTypLibCompatible>\r
-      <SuppressStartupBanner>true</SuppressStartupBanner>\r
-      <TargetEnvironment>Win32</TargetEnvironment>\r
-      <TypeLibraryName>$(IntDir)curllib.tlb</TypeLibraryName>\r
-      <HeaderFileName>\r
-      </HeaderFileName>\r
-    </Midl>\r
-    <ClCompile>\r
-      <Optimization>MaxSpeed</Optimization>\r
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
-      <AdditionalIncludeDirectories>..\..\curl-$(cURL_Version)\lib\;..\..\curl-$(cURL_Version)\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL;USE_SSLEAY;USE_OPENSSL;CURL_DISABLE_LDAP;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <StringPooling>true</StringPooling>\r
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
-      <FunctionLevelLinking>true</FunctionLevelLinking>\r
-      <BrowseInformation>true</BrowseInformation>\r
-      <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
-      <SuppressStartupBanner>true</SuppressStartupBanner>\r
-    </ClCompile>\r
-    <ResourceCompile>\r
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <Culture>0x0409</Culture>\r
-    </ResourceCompile>\r
-    <Bscmake>\r
-      <SuppressStartupBanner>true</SuppressStartupBanner>\r
-      <OutputFile>$(IntDir)curllib.bsc</OutputFile>\r
-    </Bscmake>\r
-  </ItemDefinitionGroup>\r
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
-    <Midl>\r
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <MkTypLibCompatible>true</MkTypLibCompatible>\r
-      <SuppressStartupBanner>true</SuppressStartupBanner>\r
-      <TargetEnvironment>X64</TargetEnvironment>\r
-      <TypeLibraryName>$(IntDir)curllib.tlb</TypeLibraryName>\r
-      <HeaderFileName>\r
-      </HeaderFileName>\r
-    </Midl>\r
-    <ClCompile>\r
-      <Optimization>MaxSpeed</Optimization>\r
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
-      <AdditionalIncludeDirectories>..\..\curl-$(cURL_Version)\lib\;..\..\curl-$(cURL_Version)\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL;USE_SSLEAY;USE_OPENSSL;CURL_DISABLE_LDAP;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <StringPooling>true</StringPooling>\r
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
-      <FunctionLevelLinking>true</FunctionLevelLinking>\r
-      <BrowseInformation>true</BrowseInformation>\r
-      <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
-      <SuppressStartupBanner>true</SuppressStartupBanner>\r
-    </ClCompile>\r
-    <ResourceCompile>\r
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <Culture>0x0409</Culture>\r
-    </ResourceCompile>\r
-    <Bscmake>\r
-      <SuppressStartupBanner>true</SuppressStartupBanner>\r
-      <OutputFile>$(IntDir)curllib.bsc</OutputFile>\r
-    </Bscmake>\r
-  </ItemDefinitionGroup>\r
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
-    <Midl>\r
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <MkTypLibCompatible>true</MkTypLibCompatible>\r
-      <SuppressStartupBanner>true</SuppressStartupBanner>\r
-      <TargetEnvironment>Win32</TargetEnvironment>\r
-      <TypeLibraryName>$(IntDir)curllib.tlb</TypeLibraryName>\r
-      <HeaderFileName>\r
-      </HeaderFileName>\r
-    </Midl>\r
-    <ClCompile>\r
-      <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>..\..\curl-$(cURL_Version)\lib\;..\..\curl-$(cURL_Version)\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL;USE_SSLEAY;USE_OPENSSL;CURL_DISABLE_LDAP;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <MinimalRebuild>true</MinimalRebuild>\r
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
-      <BrowseInformation>true</BrowseInformation>\r
-      <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
-      <SuppressStartupBanner>true</SuppressStartupBanner>\r
-    </ClCompile>\r
-    <ResourceCompile>\r
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <Culture>0x0409</Culture>\r
-    </ResourceCompile>\r
-    <Bscmake>\r
-      <SuppressStartupBanner>true</SuppressStartupBanner>\r
-      <OutputFile>$(IntDir)curllib.bsc</OutputFile>\r
-    </Bscmake>\r
-  </ItemDefinitionGroup>\r
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
-    <Midl>\r
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <MkTypLibCompatible>true</MkTypLibCompatible>\r
-      <SuppressStartupBanner>true</SuppressStartupBanner>\r
-      <TargetEnvironment>X64</TargetEnvironment>\r
-      <TypeLibraryName>$(IntDir)curllib.tlb</TypeLibraryName>\r
-      <HeaderFileName>\r
-      </HeaderFileName>\r
-    </Midl>\r
-    <ClCompile>\r
-      <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>..\..\curl-$(cURL_Version)\lib\;..\..\curl-$(cURL_Version)\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL;USE_SSLEAY;USE_OPENSSL;CURL_DISABLE_LDAP;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <MinimalRebuild>true</MinimalRebuild>\r
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
-      <BrowseInformation>true</BrowseInformation>\r
-      <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
-      <SuppressStartupBanner>true</SuppressStartupBanner>\r
-    </ClCompile>\r
-    <ResourceCompile>\r
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <Culture>0x0409</Culture>\r
-    </ResourceCompile>\r
-    <Bscmake>\r
-      <SuppressStartupBanner>true</SuppressStartupBanner>\r
-      <OutputFile>$(IntDir)curllib.bsc</OutputFile>\r
-    </Bscmake>\r
-  </ItemDefinitionGroup>\r
-  <ItemGroup>\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\amigaos.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\asyn-ares.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\asyn-thread.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\base64.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\conncache.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\connect.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\content_encoding.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\cookie.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_addrinfo.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_des.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_endian.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_fnmatch.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_gethostname.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_gssapi.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_memrchr.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_multibyte.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_ntlm_core.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_ntlm_wb.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_rtmp.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_sasl.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_sspi.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_threads.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\dict.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\dotdot.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\easy.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\escape.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\file.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\fileinfo.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\formdata.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\ftp.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\ftplistparser.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\getenv.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\getinfo.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\gopher.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\hash.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\hmac.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\hostasyn.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\hostcheck.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\hostip4.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\hostip6.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\hostip.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\hostsyn.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\http2.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\http.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\http_chunks.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\http_digest.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\http_negotiate.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\http_ntlm.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\http_proxy.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\idn_win32.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\if2ip.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\imap.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\inet_ntop.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\inet_pton.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\krb5.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\ldap.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\llist.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\md4.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\md5.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\memdebug.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\mprintf.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\multi.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\netrc.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\non-ascii.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\nonblock.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\openldap.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\parsedate.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\pingpong.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\pipeline.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\pop3.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\progress.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\rand.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\rtsp.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\security.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\select.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\sendf.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\share.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\slist.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\smb.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\smtp.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\socks.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\socks_gssapi.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\socks_sspi.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\speedcheck.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\splay.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\ssh.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\strcase.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\strdup.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\strerror.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\strtok.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\strtoofft.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\system_win32.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\telnet.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\tftp.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\timeval.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\transfer.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\url.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\version.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\warnless.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\wildcard.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\x509asn1.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vauth\cleartext.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vauth\cram.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vauth\digest.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vauth\digest_sspi.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vauth\krb5_gssapi.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vauth\krb5_sspi.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vauth\ntlm.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vauth\ntlm_sspi.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vauth\oauth2.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vauth\spnego_gssapi.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vauth\spnego_sspi.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vauth\vauth.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vtls\axtls.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vtls\cyassl.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vtls\darwinssl.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vtls\gskit.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vtls\gtls.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vtls\mbedtls.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vtls\nss.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vtls\openssl.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vtls\polarssl.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vtls\polarssl_threadlock.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vtls\schannel.c" />\r
-    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vtls\vtls.c" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\amigaos.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\arpa_telnet.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\asyn.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\config-win32.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\conncache.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\connect.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\content_encoding.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\cookie.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_addrinfo.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_base64.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_des.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_endian.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_fnmatch.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_gethostname.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_gssapi.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_hmac.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_ldap.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_md4.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_md5.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_memory.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_memrchr.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_multibyte.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_ntlm_core.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_ntlm_wb.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_printf.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_rtmp.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_sasl.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_sec.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_setup.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_setup_once.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_sspi.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_threads.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curlx.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\dict.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\dotdot.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\easyif.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\escape.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\file.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\fileinfo.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\formdata.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\ftp.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\ftplistparser.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\getinfo.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\gopher.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\hash.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\hostcheck.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\hostip.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\http2.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\http_chunks.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\http_digest.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\http.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\http_negotiate.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\http_ntlm.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\http_proxy.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\if2ip.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\imap.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\inet_ntop.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\inet_pton.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\llist.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\memdebug.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\multihandle.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\multiif.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\netrc.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\non-ascii.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\nonblock.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\parsedate.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\pingpong.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\pipeline.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\pop3.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\progress.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\rand.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\rtsp.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\select.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\sendf.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\setup-vms.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\share.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\sigpipe.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\slist.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\smb.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\smtp.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\sockaddr.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\socks.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\speedcheck.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\splay.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\ssh.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\strcase.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\strdup.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\strerror.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\strtok.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\strtoofft.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\system_win32.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\telnet.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\tftp.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\timeval.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\transfer.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\urldata.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\url.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\warnless.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\wildcard.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\x509asn1.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vauth\digest.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vauth\ntlm.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vauth\vauth.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vtls\axtls.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vtls\cyassl.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vtls\darwinssl.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vtls\gskit.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vtls\gtls.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vtls\mbedtls.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vtls\nssg.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vtls\openssl.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vtls\polarssl.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vtls\polarssl_threadlock.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vtls\schannel.h" />\r
-    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vtls\vtls.h" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\Download CURL.2015.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
-</Project>
\ No newline at end of file
index 8665e366a69dec420e9521c262b0f0a9b84e6c6f..64a32e607678694b6a40f431f9b5fd83ebca5ef0 100644 (file)
@@ -72,7 +72,6 @@
   </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <ClCompile>\r
-      <PreprocessorDefinitions>CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
     </ClCompile>\r
@@ -87,7 +86,6 @@
       <TargetEnvironment>X64</TargetEnvironment>\r
     </Midl>\r
     <ClCompile>\r
-      <PreprocessorDefinitions>CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
     </ClCompile>\r
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
     <ClCompile>\r
-      <PreprocessorDefinitions>CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
     </ClCompile>\r
       <TargetEnvironment>X64</TargetEnvironment>\r
     </Midl>\r
     <ClCompile>\r
-      <PreprocessorDefinitions>CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
     </ClCompile>\r
     <ClCompile Include="mod_curl.c" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ProjectReference Include="..\..\..\..\libs\win32\curl\curllib.2015.vcxproj">\r
-      <Project>{87ee9da4-de1e-4448-8324-183c98dca588}</Project>\r
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\r
-    </ProjectReference>\r
     <ProjectReference Include="..\..\..\..\w32\Library\FreeSwitchCore.2015.vcxproj">\r
       <Project>{202d7a4e-760d-4d0e-afa1-d7459ced30ff}</Project>\r
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\r
index f8e10d063e78617465271b1630f33ee4506bbdea..5d0cf7e87dcf69ee32ef04930440138045707268 100644 (file)
@@ -45,7 +45,7 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />  
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(SolutionDir)\w32\openssl.props" />
   <Import Project="$(SolutionDir)\w32\curl.props" />
   <ImportGroup Label="ExtensionSettings">
     <ClCompile Include="common.c" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SolutionDir)\libs\win32\curl\curllib.2015.vcxproj">
-      <Project>{87ee9da4-de1e-4448-8324-183c98dca588}</Project>
-    </ProjectReference>
     <ProjectReference Include="$(SolutionDir)\w32\Library\FreeSwitchCore.2015.vcxproj">
       <Project>{202d7a4e-760d-4d0e-afa1-d7459ced30ff}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
index f4ba0a1c7b79cc7ba3e3c39fedf8deea80a3e9e5..256ef22386dba4148b0022c0290ec73ea37807c2 100644 (file)
@@ -75,7 +75,7 @@
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
       <AdditionalIncludeDirectories>../../../../libs/lame-3.98.4/include;..\..\..\..\libs\win32\libshout;..\..\..\..\libs\libshout-2.2.2\include;..\..\..\..\libs\mpg123\src;..\..\..\..\libs\win32\mpg123;..\..\..\..\libs\win32\mpg123\libmpg123;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PreprocessorDefinitions>_TIMESPEC_DEFINED;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>_TIMESPEC_DEFINED;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <MinimalRebuild>true</MinimalRebuild>\r
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
@@ -97,7 +97,7 @@
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
       <AdditionalIncludeDirectories>../../../../libs/lame-3.98.4/include;..\..\..\..\libs\win32\libshout;..\..\..\..\libs\libshout-2.2.2\include;..\..\..\..\libs\mpg123\src;..\..\..\..\libs\win32\mpg123;..\..\..\..\libs\win32\mpg123\libmpg123;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PreprocessorDefinitions>CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <MinimalRebuild>true</MinimalRebuild>\r
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <Optimization>MaxSpeed</Optimization>\r
       <IntrinsicFunctions>true</IntrinsicFunctions>\r
       <AdditionalIncludeDirectories>../../../../libs/lame-3.98.4/include;..\..\..\..\libs\win32\libshout;..\..\..\..\libs\libshout-2.2.2\include;..\..\..\..\libs\mpg123\src;..\..\..\..\libs\win32\mpg123;..\..\..\..\libs\win32\mpg123\libmpg123;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PreprocessorDefinitions>_TIMESPEC_DEFINED;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>_TIMESPEC_DEFINED;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
       <WarningLevel>Level3</WarningLevel>\r
       <Optimization>MaxSpeed</Optimization>\r
       <IntrinsicFunctions>true</IntrinsicFunctions>\r
       <AdditionalIncludeDirectories>../../../../libs/lame-3.98.4/include;..\..\..\..\libs\win32\libshout;..\..\..\..\libs\libshout-2.2.2\include;..\..\..\..\libs\mpg123\src;..\..\..\..\libs\win32\mpg123;..\..\..\..\libs\win32\mpg123\libmpg123;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PreprocessorDefinitions>CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
       <WarningLevel>Level3</WarningLevel>\r
     <ClInclude Include="mpglib.h" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ProjectReference Include="..\..\..\..\libs\win32\curl\curllib.2015.vcxproj">\r
-      <Project>{87ee9da4-de1e-4448-8324-183c98dca588}</Project>\r
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\r
-    </ProjectReference>\r
     <ProjectReference Include="..\..\..\..\libs\win32\libmp3lame\libmp3lame.2015.vcxproj">\r
       <Project>{e316772f-5d8f-4f2a-8f71-094c3e859d34}</Project>\r
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\r
index df75233dc62c603e408878c3fbe80f50fbc11632..1c25a1b01cb429f1feeaefbcd5b7c6d96b0eba66 100644 (file)
     <ProjectReference Include="..\..\..\..\libs\libteletone\libteletone.2015.vcxproj">\r
       <Project>{89385c74-5860-4174-9caf-a39e7c48909c}</Project>\r
     </ProjectReference>\r
-    <ProjectReference Include="..\..\..\..\libs\win32\curl\curllib.2015.vcxproj">\r
-      <Project>{87ee9da4-de1e-4448-8324-183c98dca588}</Project>\r
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\r
-    </ProjectReference>\r
     <ProjectReference Include="..\..\..\..\w32\Library\FreeSwitchCore.2015.vcxproj">\r
       <Project>{202d7a4e-760d-4d0e-afa1-d7459ced30ff}</Project>\r
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\r
index 855c6b69d0a954b9dcf0d8088a5b797042456541..6231095ec7bfacdcea1a05e5981d33d926e99375 100644 (file)
     <ClCompile Include="mod_v8_skel.cpp" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ProjectReference Include="..\..\..\..\libs\win32\curl\curllib.2015.vcxproj">\r
-      <Project>{87ee9da4-de1e-4448-8324-183c98dca588}</Project>\r
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\r
-    </ProjectReference>\r
     <ProjectReference Include="..\..\..\..\w32\Library\FreeSwitchCore.2015.vcxproj">\r
       <Project>{202d7a4e-760d-4d0e-afa1-d7459ced30ff}</Project>\r
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\r
index b3f3c812363540b1687a3c9d3c167152a3b33627..6f3796937a3f1d3bb03ef46bcbdcf58feedea678 100644 (file)
       <Project>{f6c55d93-b927-4483-bb69-15aef3dd2dff}</Project>\r
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\r
     </ProjectReference>\r
-    <ProjectReference Include="..\..\..\..\libs\win32\curl\curllib.2015.vcxproj">\r
-      <Project>{87ee9da4-de1e-4448-8324-183c98dca588}</Project>\r
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\r
-    </ProjectReference>\r
     <ProjectReference Include="..\..\..\..\w32\Library\FreeSwitchCore.2015.vcxproj">\r
       <Project>{202d7a4e-760d-4d0e-afa1-d7459ced30ff}</Project>\r
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\r
index 1ea0611f349ed57e06fb1033d797f61f07feae6e..92cdbc5a9aa5f9783ae09fc065fa26e7f90fb908 100644 (file)
     <ClCompile Include="mod_xml_curl.c" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ProjectReference Include="..\..\..\..\libs\win32\curl\curllib.2015.vcxproj">\r
-      <Project>{87ee9da4-de1e-4448-8324-183c98dca588}</Project>\r
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\r
-    </ProjectReference>\r
     <ProjectReference Include="..\..\..\..\w32\Library\FreeSwitchCore.2015.vcxproj">\r
       <Project>{202d7a4e-760d-4d0e-afa1-d7459ced30ff}</Project>\r
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\r
index 583100e5a5e8c6ca6f3fac60f8ea0107a909978a..dc5169ef1dd16d1c82e20f5a009096617082d3b5 100644 (file)
@@ -754,10 +754,14 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
       <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Release|x64'">4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
     <ClCompile Include="..\..\src\switch_utf8.c">\r
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"></PrecompiledHeader>\r
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"></PrecompiledHeader>\r
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"></PrecompiledHeader>\r
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'"></PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
+      </PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
+      </PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+      </PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
+      </PrecompiledHeader>\r
     </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
@@ -892,9 +896,6 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
       <LinkLibraryDependencies>true</LinkLibraryDependencies>\r
       <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>\r
     </ProjectReference>\r
-    <ProjectReference Include="..\..\libs\win32\curl\curllib.2015.vcxproj">\r
-      <Project>{87ee9da4-de1e-4448-8324-183c98dca588}</Project>\r
-    </ProjectReference>\r
     <ProjectReference Include="..\..\libs\win32\pcre\libpcre.2015.vcxproj">\r
       <Project>{8d04b550-d240-4a44-8a18-35da3f7038d9}</Project>\r
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\r
index 0e13f8d88a3cc0224689b593d50a163f2af4434b..0c9c4de24c7d1d77fa5353a8a40a55c6ac6d0753 100644 (file)
@@ -2,16 +2,16 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets" />
   <PropertyGroup Label="UserMacros">
-    <cURL_Version>7.54.1</cURL_Version>
+    <curlVersion>7.59.0</curlVersion>
   </PropertyGroup>
   <PropertyGroup>
-    <cURL_VersionImported>true</cURL_VersionImported>
+    <curlVersionImported>true</curlVersionImported>
   </PropertyGroup>
   <PropertyGroup />
   <ItemDefinitionGroup />
   <ItemGroup>
-    <BuildMacro Include="cURL_Version">
-      <Value>$(cURL_Version)</Value>
+    <BuildMacro Include="curlVersion">
+      <Value>$(curlVersion)</Value>
     </BuildMacro>
   </ItemGroup>
 </Project>
\ No newline at end of file
index e591da7aa1cf2e489618bf575f73a50030dbaa42..791d967adafb1b03ae355f8c4a938ea6420cce89 100644 (file)
@@ -1,15 +1,72 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ImportGroup Label="PropertySheets">\r
-    <Import Project="curl-version.props" Condition=" '$(cURL_VersionImported)' == '' "/>\r
+    <Import Project="curl-version.props" Condition=" '$(curlVersionImported)' == '' "/>\r
+    <Import Project="downloadpackage.task" Condition=" '$(downloadpackagetask_Imported)' == '' " />\r
+    <Import Project="openssl.props" />\r
+    <Import Project="zlib.props" />\r
   </ImportGroup>\r
   <PropertyGroup>\r
     <CurlPropsImported>true</CurlPropsImported>\r
   </PropertyGroup>\r
+\r
+  <PropertyGroup>\r
+    <LibraryConfiguration Condition="$(Configuration.ToLower().Contains('debug'))">Debug</LibraryConfiguration>\r
+    <LibraryConfiguration Condition="$(Configuration.ToLower().Contains('release'))">Release</LibraryConfiguration>\r
+  </PropertyGroup>\r
+\r
+  <PropertyGroup Label="UserMacros">\r
+    <curlLibDir>$(SolutionDir)libs\curl-$(curlVersion)</curlLibDir>\r
+  </PropertyGroup>\r
+\r
+  <!--\r
+       Download Target.\r
+       Name must be unique.\r
+       By design, targets are executed only once per project.\r
+\r
+       Usage:\r
+\r
+       package: URI\r
+\r
+       expectfileordirectory: Skips the download and extraction if exists\r
+\r
+       outputfolder: Folder to store a downloaded file.\r
+                     By default "$(BaseDir)libs", if empty\r
+\r
+       outputfilename: If not empty, overrides filename from URI.\r
+                       .exe files don't get extracted\r
+\r
+       extractto: Folder to extract an archive to\r
+   -->\r
+\r
+  <Target Name="curlBinariesDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">\r
+      <DownloadPackageTask\r
+           package="http://files.freeswitch.org/windows/packages/curl/$(curlVersion)/curl-$(curlVersion)-binaries-$(Platform.ToLower())-$(LibraryConfiguration.ToLower()).zip"\r
+           expectfileordirectory="$(curlLibDir)\binaries\$(Platform)\$(LibraryConfiguration)\curl.lib"\r
+           outputfolder=""\r
+           outputfilename=""\r
+           extractto="$(BaseDir)libs\"\r
+      />\r
+  </Target>\r
+  <Target Name="curlHeadersDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">\r
+      <DownloadPackageTask\r
+           package="http://files.freeswitch.org/windows/packages/curl/$(curlVersion)/curl-$(curlVersion)-headers.zip"\r
+           expectfileordirectory="$(curlLibDir)\include\curl\curl.h"\r
+           outputfolder=""\r
+           outputfilename=""\r
+           extractto="$(BaseDir)libs\"\r
+      />\r
+  </Target>\r
+\r
   <ItemDefinitionGroup>\r
     <ClCompile>\r
-      <AdditionalIncludeDirectories>$(SolutionDir)libs\curl-$(cURL_Version)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>$(curlLibDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>HAVE_CURL;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
     </ClCompile>\r
+    <Link>\r
+      <AdditionalLibraryDirectories>$(curlLibDir)\binaries\$(Platform)\$(LibraryConfiguration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>curl.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+    </Link>\r
   </ItemDefinitionGroup>\r
+\r
 </Project>
\ No newline at end of file
index 9d6a04239edb257425ce697c5b5bf0bbc9645086..0d927cce7a0799ddf7af66ff47ec0d2ece4f093b 100644 (file)
@@ -8,6 +8,11 @@
     <OpensslPropsImported>true</OpensslPropsImported>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <LibraryConfiguration Condition="$(Configuration.ToLower().Contains('debug'))">Debug</LibraryConfiguration>
+    <LibraryConfiguration Condition="$(Configuration.ToLower().Contains('release'))">Release</LibraryConfiguration>
+  </PropertyGroup>
+
   <!-- 
        Download Target.
        Name must be unique. 
@@ -30,8 +35,8 @@
 
   <Target Name="opensslbinariesTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">  
       <DownloadPackageTask 
-           package="http://files.freeswitch.org/windows/packages/openssl/$(OpenSSLVersion)/openssl-$(OpenSSLVersion)-binaries-$(Platform.ToLower())-$(Configuration.ToLower()).zip"
-           expectfileordirectory="$(OpenSSLLibDir)\binaries\$(Platform)\$(Configuration)\openssl.exe" 
+           package="http://files.freeswitch.org/windows/packages/openssl/$(OpenSSLVersion)/openssl-$(OpenSSLVersion)-binaries-$(Platform.ToLower())-$(LibraryConfiguration.ToLower()).zip"
+           expectfileordirectory="$(OpenSSLLibDir)\binaries\$(Platform)\$(LibraryConfiguration)\openssl.exe"
            outputfolder=""
            outputfilename="" 
            extractto="$(BaseDir)libs"
 
   <Target Name="opensslcopyTarget" BeforeTargets="CustomBuild" DependsOnTargets="opensslbinariesTarget">  
       <ItemGroup>  
-          <opensslFiles Include="$(OpenSSLLibDir)\binaries\$(Platform)\$(Configuration)\*.*"/>  
+          <opensslFiles Include="$(OpenSSLLibDir)\binaries\$(Platform)\$(LibraryConfiguration)\*.*"/>
       </ItemGroup>  
-      <Copy Condition="!exists('$(BaseDir)\$(Platform)\$(Configuration)\openssl.exe')"
+      <Copy Condition="!exists('$(BaseDir)\$(Platform)\$(LibraryConfiguration)\openssl.exe')"
           SourceFiles="@(opensslFiles)"  
-          DestinationFiles="@(opensslFiles->'$(BaseDir)\$(Platform)\$(Configuration)\%(Filename)%(Extension)')"  
+          DestinationFiles="@(opensslFiles->'$(BaseDir)\$(Platform)\$(LibraryConfiguration)\%(Filename)%(Extension)')"
       />  
   </Target>   
 
@@ -66,7 +71,7 @@
       <PreprocessorDefinitions>HAVE_OPENSSL;HAVE_OPENSSL_DTLS_SRTP;HAVE_OPENSSL_DTLS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
-      <AdditionalLibraryDirectories>$(OpenSSLLibDir)\binaries\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(OpenSSLLibDir)\binaries\$(Platform)\$(LibraryConfiguration)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies Condition="'$(Platform)'=='Win32'">ws2_32.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalDependencies Condition="'$(Platform)'=='x64'">ws2_32.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
index af8292a2c46fb5174a43042f52667f5dea62bc47..47d64d27a1e64f6ad9988c8b1170047c52377d79 100644 (file)
@@ -5,6 +5,11 @@
     <Import Project="downloadpackage.task" Condition=" '$(downloadpackagetask_Imported)' == '' " />
   </ImportGroup>
 
+  <PropertyGroup>
+    <LibraryConfiguration Condition="$(Configuration.ToLower().Contains('debug'))">Debug</LibraryConfiguration>
+    <LibraryConfiguration Condition="$(Configuration.ToLower().Contains('release'))">Release</LibraryConfiguration>
+  </PropertyGroup>
+
   <PropertyGroup Label="UserMacros">
     <zliblibDir>$(BaseDir)libs\zlib-$(zlibVersion)</zliblibDir>
   </PropertyGroup>
@@ -31,8 +36,8 @@
 
   <Target Name="zlibBinariesDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">  
       <DownloadPackageTask 
-           package="http://files.freeswitch.org/windows/packages/zlib/$(zlibVersion)/zlib-$(zlibVersion)-binaries-$(Platform.ToLower())-$(Configuration.ToLower()).zip"
-           expectfileordirectory="$(zliblibDir)\binaries\$(Platform)\$(Configuration)\zlib.lib" 
+           package="http://files.freeswitch.org/windows/packages/zlib/$(zlibVersion)/zlib-$(zlibVersion)-binaries-$(Platform.ToLower())-$(LibraryConfiguration.ToLower()).zip"
+           expectfileordirectory="$(zliblibDir)\binaries\$(Platform)\$(LibraryConfiguration)\zlib.lib"
            outputfolder=""
            outputfilename="" 
            extractto="$(BaseDir)libs\"
@@ -54,7 +59,7 @@
       <PreprocessorDefinitions>HAVE_ZLIB;ZLIB_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
-      <AdditionalLibraryDirectories>$(SolutionDir)libs\zlib-$(zlibVersion)\binaries\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(SolutionDir)libs\zlib-$(zlibVersion)\binaries\$(Platform)\$(LibraryConfiguration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>