From c31e7062b75bee66580fbc80bc0d6f27a992a827 Mon Sep 17 00:00:00 2001 From: Andrey Volk Date: Sat, 31 Mar 2018 21:59:02 +0300 Subject: [PATCH] FS-11085: [Build-System] Update curl to 7.59.0 and move to pre-compiled binaries on Windows. --- Freeswitch.2015.sln | 28 -- libs/.gitignore | 2 + libs/win32/Download CURL.2015.vcxproj | 85 ---- libs/win32/curl/ca-bundle.h | 1 - libs/win32/curl/cleancount | 1 - libs/win32/curl/curllib.2010.vcxproj.filters | 340 ------------- libs/win32/curl/curllib.2015.vcxproj | 450 ------------------ .../mod_curl/mod_curl.2015.vcxproj | 8 - .../mod_http_cache/mod_http_cache.vcxproj | 5 +- .../formats/mod_shout/mod_shout.2015.vcxproj | 12 +- src/mod/languages/mod_v8/mod_v8.2015.vcxproj | 4 - .../languages/mod_v8/mod_v8_skel.2015.vcxproj | 4 - .../mod_xml_cdr/mod_xml_cdr.2015.vcxproj | 4 - .../mod_xml_curl/mod_xml_curl.2015.vcxproj | 4 - w32/Library/FreeSwitchCore.2015.vcxproj | 15 +- w32/curl-version.props | 8 +- w32/curl.props | 61 ++- w32/openssl.props | 17 +- w32/zlib.props | 11 +- 19 files changed, 97 insertions(+), 963 deletions(-) delete mode 100644 libs/win32/Download CURL.2015.vcxproj delete mode 100644 libs/win32/curl/ca-bundle.h delete mode 100644 libs/win32/curl/cleancount delete mode 100644 libs/win32/curl/curllib.2010.vcxproj.filters delete mode 100644 libs/win32/curl/curllib.2015.vcxproj 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 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - Download CURL - {3970BCDE-BE1A-4CF3-A65F-5264BA2E47B5} - Download CURL - Win32Proj - - - - Utility - MultiByte - v140 - - - Utility - MultiByte - v140 - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(PlatformName)\CURL\$(Configuration)\ - $(PlatformName)\CURL\$(Configuration)\ - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - $(IntDir)BuildLog $(ProjectName).htm - - - - - - - - - - - - - Document - Downloading Curl. - 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).." - - $(ProjectDir)..\curl-$(cURL_Version);%(Outputs) - Downloading Curl. - 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).." - - $(ProjectDir)..\curl-$(cURL_Version);%(Outputs) - - - - - - \ 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 @@ - - - - - {6b959500-cd81-4335-bdf2-c430b2f07328} - - - {ee1686be-f512-40e0-8f5e-76480b95aafc} - - - {fd722a55-89b7-4153-9226-3eec445000d1} - ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - \ 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 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - curllib - {87EE9DA4-DE1E-4448-8324-183C98DCA588} - curllib - - - - StaticLibrary - false - MultiByte - v140 - - - StaticLibrary - false - MultiByte - v140 - - - StaticLibrary - false - MultiByte - v140 - - - StaticLibrary - false - MultiByte - v140 - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - $(IntDir)curllib.tlb - - - - - MaxSpeed - OnlyExplicitInline - ..\..\curl-$(cURL_Version)\lib\;..\..\curl-$(cURL_Version)\include;.;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL;USE_SSLEAY;USE_OPENSSL;CURL_DISABLE_LDAP;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - true - TurnOffAllWarnings - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - true - $(IntDir)curllib.bsc - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - X64 - $(IntDir)curllib.tlb - - - - - MaxSpeed - OnlyExplicitInline - ..\..\curl-$(cURL_Version)\lib\;..\..\curl-$(cURL_Version)\include;.;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL;USE_SSLEAY;USE_OPENSSL;CURL_DISABLE_LDAP;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - true - TurnOffAllWarnings - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - true - $(IntDir)curllib.bsc - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - $(IntDir)curllib.tlb - - - - - Disabled - ..\..\curl-$(cURL_Version)\lib\;..\..\curl-$(cURL_Version)\include;.;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL;USE_SSLEAY;USE_OPENSSL;CURL_DISABLE_LDAP;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - true - TurnOffAllWarnings - true - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - true - $(IntDir)curllib.bsc - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - X64 - $(IntDir)curllib.tlb - - - - - Disabled - ..\..\curl-$(cURL_Version)\lib\;..\..\curl-$(cURL_Version)\include;.;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL;USE_SSLEAY;USE_OPENSSL;CURL_DISABLE_LDAP;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - true - TurnOffAllWarnings - true - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - true - $(IntDir)curllib.bsc - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {3970bcde-be1a-4cf3-a65f-5264ba2e47b5} - - - - - - \ 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 @@ - CURL_STATICLIB;%(PreprocessorDefinitions) @@ -87,7 +86,6 @@ X64 - CURL_STATICLIB;%(PreprocessorDefinitions) @@ -100,7 +98,6 @@ - CURL_STATICLIB;%(PreprocessorDefinitions) @@ -115,7 +112,6 @@ X64 - CURL_STATICLIB;%(PreprocessorDefinitions) @@ -130,10 +126,6 @@ - - {87ee9da4-de1e-4448-8324-183c98dca588} - false - {202d7a4e-760d-4d0e-afa1-d7459ced30ff} false 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 @@ MultiByte v140 - + @@ -133,9 +133,6 @@ - - {87ee9da4-de1e-4448-8324-183c98dca588} - {202d7a4e-760d-4d0e-afa1-d7459ced30ff} false 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 @@ Disabled ../../../../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) - _TIMESPEC_DEFINED;CURL_STATICLIB;%(PreprocessorDefinitions) + _TIMESPEC_DEFINED;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -97,7 +97,7 @@ Disabled ../../../../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) - CURL_STATICLIB;%(PreprocessorDefinitions) + %(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -117,7 +117,7 @@ MaxSpeed true ../../../../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) - _TIMESPEC_DEFINED;CURL_STATICLIB;%(PreprocessorDefinitions) + _TIMESPEC_DEFINED;%(PreprocessorDefinitions) MultiThreadedDLL true Level3 @@ -141,7 +141,7 @@ MaxSpeed true ../../../../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) - CURL_STATICLIB;%(PreprocessorDefinitions) + %(PreprocessorDefinitions) MultiThreadedDLL true Level3 @@ -166,10 +166,6 @@ - - {87ee9da4-de1e-4448-8324-183c98dca588} - false - {e316772f-5d8f-4f2a-8f71-094c3e859d34} false 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 @@ {89385c74-5860-4174-9caf-a39e7c48909c} - - {87ee9da4-de1e-4448-8324-183c98dca588} - false - {202d7a4e-760d-4d0e-afa1-d7459ced30ff} false 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 @@ - - {87ee9da4-de1e-4448-8324-183c98dca588} - false - {202d7a4e-760d-4d0e-afa1-d7459ced30ff} false 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 @@ {f6c55d93-b927-4483-bb69-15aef3dd2dff} false - - {87ee9da4-de1e-4448-8324-183c98dca588} - false - {202d7a4e-760d-4d0e-afa1-d7459ced30ff} false 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 @@ - - {87ee9da4-de1e-4448-8324-183c98dca588} - false - {202d7a4e-760d-4d0e-afa1-d7459ced30ff} false 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 4100;%(DisableSpecificWarnings) - - - - + + + + + + + + @@ -892,9 +896,6 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs true false - - {87ee9da4-de1e-4448-8324-183c98dca588} - {8d04b550-d240-4a44-8a18-35da3f7038d9} false 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 @@ - 7.54.1 + 7.59.0 - true + true - - $(cURL_Version) + + $(curlVersion) \ 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 @@  - + + + + true + + + Debug + Release + + + + $(SolutionDir)libs\curl-$(curlVersion) + + + + + + + + + + + - $(SolutionDir)libs\curl-$(cURL_Version)\include;%(AdditionalIncludeDirectories) + $(curlLibDir)\include;%(AdditionalIncludeDirectories) HAVE_CURL;CURL_STATICLIB;%(PreprocessorDefinitions) + + $(curlLibDir)\binaries\$(Platform)\$(LibraryConfiguration);%(AdditionalLibraryDirectories) + curl.lib;%(AdditionalDependencies) + + \ 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 @@ true + + Debug + Release + +