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