diff --git a/libs/win32/Download CURL.2015.vcxproj b/libs/win32/Download CURL.2015.vcxproj index 2d6bdf152e..fcdcfeeb77 100644 --- a/libs/win32/Download CURL.2015.vcxproj +++ b/libs/win32/Download CURL.2015.vcxproj @@ -29,6 +29,7 @@ + @@ -69,13 +70,13 @@ Document Downloading Curl. - if not exist "$(ProjectDir)..\curl-7.35.0" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/curl-7.35.0.tar.gz "$(ProjectDir).." + 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-7.35.0;%(Outputs) + $(ProjectDir)..\curl-$(cURL_Version);%(Outputs) Downloading Curl. - if not exist "$(ProjectDir)..\curl-7.35.0" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/curl-7.35.0.tar.gz "$(ProjectDir).." + 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-7.35.0;%(Outputs) + $(ProjectDir)..\curl-$(cURL_Version);%(Outputs) diff --git a/libs/win32/curl/curllib.2015.vcxproj b/libs/win32/curl/curllib.2015.vcxproj index 2c88aa90d2..a6567c8fda 100644 --- a/libs/win32/curl/curllib.2015.vcxproj +++ b/libs/win32/curl/curllib.2015.vcxproj @@ -49,27 +49,25 @@ v140 + + - - - - @@ -88,7 +86,7 @@ MaxSpeed OnlyExplicitInline - ..\..\curl-7.35.0\lib\;..\..\curl-7.35.0\include;.;..\..\openssl-$(OpenSSLVersion)\include;%(AdditionalIncludeDirectories) + ..\..\curl-$(cURL_Version)\lib\;..\..\curl-$(cURL_Version)\include;.;..\..\openssl-$(OpenSSLVersion)\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL;USE_SSLEAY;USE_OPENSSL;CURL_DISABLE_LDAP;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -119,7 +117,7 @@ MaxSpeed OnlyExplicitInline - ..\..\curl-7.35.0\lib\;..\..\curl-7.35.0\include;.;..\..\openssl-$(OpenSSLVersion)\include;%(AdditionalIncludeDirectories) + ..\..\curl-$(cURL_Version)\lib\;..\..\curl-$(cURL_Version)\include;.;..\..\openssl-$(OpenSSLVersion)\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL;USE_SSLEAY;USE_OPENSSL;CURL_DISABLE_LDAP;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -149,7 +147,7 @@ Disabled - ..\..\curl-7.35.0\lib\;..\..\curl-7.35.0\include;.;..\..\openssl-$(OpenSSLVersion)\include;%(AdditionalIncludeDirectories) + ..\..\curl-$(cURL_Version)\lib\;..\..\curl-$(cURL_Version)\include;.;..\..\openssl-$(OpenSSLVersion)\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL;USE_SSLEAY;USE_OPENSSL;CURL_DISABLE_LDAP;%(PreprocessorDefinitions) true EnableFastChecks @@ -179,7 +177,7 @@ Disabled - ..\..\curl-7.35.0\lib\;..\..\curl-7.35.0\include;.;..\..\openssl-$(OpenSSLVersion)\include;%(AdditionalIncludeDirectories) + ..\..\curl-$(cURL_Version)\lib\;..\..\curl-$(cURL_Version)\include;.;..\..\openssl-$(OpenSSLVersion)\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL;USE_SSLEAY;USE_OPENSSL;CURL_DISABLE_LDAP;%(PreprocessorDefinitions) true EnableFastChecks @@ -198,141 +196,248 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/mod/applications/mod_curl/mod_curl.2015.vcxproj b/src/mod/applications/mod_curl/mod_curl.2015.vcxproj index 356dc76a02..7559a4535e 100644 --- a/src/mod/applications/mod_curl/mod_curl.2015.vcxproj +++ b/src/mod/applications/mod_curl/mod_curl.2015.vcxproj @@ -46,6 +46,7 @@ v140 + @@ -70,7 +71,6 @@ - %(RootDir)%(Directory)..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories) CURL_STATICLIB;%(PreprocessorDefinitions) @@ -86,7 +86,6 @@ X64 - %(RootDir)%(Directory)..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories) CURL_STATICLIB;%(PreprocessorDefinitions) @@ -100,7 +99,6 @@ - %(RootDir)%(Directory)..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories) CURL_STATICLIB;%(PreprocessorDefinitions) @@ -116,7 +114,6 @@ X64 - %(RootDir)%(Directory)..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories) CURL_STATICLIB;%(PreprocessorDefinitions) diff --git a/src/mod/applications/mod_httapi/mod_httapi.2015.vcxproj b/src/mod/applications/mod_httapi/mod_httapi.2015.vcxproj index 2d4a04b13a..30c314c7e2 100644 --- a/src/mod/applications/mod_httapi/mod_httapi.2015.vcxproj +++ b/src/mod/applications/mod_httapi/mod_httapi.2015.vcxproj @@ -46,6 +46,7 @@ v140 + @@ -73,7 +74,7 @@ 4456;6053;6340;6246;6011;6387;%(DisableSpecificWarnings) - $(SolutionDir)\src\include;..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\src\include;%(AdditionalIncludeDirectories) false @@ -89,7 +90,7 @@ 4456;6053;6340;6246;6011;6387;%(DisableSpecificWarnings) - $(SolutionDir)\src\include;..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\src\include;%(AdditionalIncludeDirectories) false @@ -103,7 +104,7 @@ 4456;6053;6340;6246;6011;6387;%(DisableSpecificWarnings) - $(SolutionDir)\src\include;..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\src\include;%(AdditionalIncludeDirectories) false @@ -119,7 +120,7 @@ 4456;6053;6340;6246;6011;6387;%(DisableSpecificWarnings) - $(SolutionDir)\src\include;..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\src\include;%(AdditionalIncludeDirectories) 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 1e00d0e35f..9c260e6991 100644 --- a/src/mod/applications/mod_http_cache/mod_http_cache.vcxproj +++ b/src/mod/applications/mod_http_cache/mod_http_cache.vcxproj @@ -47,6 +47,7 @@ + @@ -71,7 +72,7 @@ - $(SolutionDir)\src\include;$(SolutionDir)libs\curl-7.35.0\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\src\include;%(AdditionalIncludeDirectories) @@ -86,7 +87,7 @@ X64 - $(SolutionDir)\src\include;$(SolutionDir)\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\src\include;%(AdditionalIncludeDirectories) @@ -99,7 +100,7 @@ - $(SolutionDir)\src\include;$(SolutionDir)\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\src\include;%(AdditionalIncludeDirectories) @@ -114,7 +115,7 @@ X64 - $(SolutionDir)\src\include;$(SolutionDir)\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\src\include;%(AdditionalIncludeDirectories) diff --git a/src/mod/applications/mod_snom/mod_snom.2015.vcxproj b/src/mod/applications/mod_snom/mod_snom.2015.vcxproj index 969e8ddcbe..3e5288b0d3 100644 --- a/src/mod/applications/mod_snom/mod_snom.2015.vcxproj +++ b/src/mod/applications/mod_snom/mod_snom.2015.vcxproj @@ -46,6 +46,7 @@ v140 + @@ -74,7 +75,7 @@ 6385;6340;6246;6011;6387;%(DisableSpecificWarnings) - $(SolutionDir)\src\include;..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\src\include;%(AdditionalIncludeDirectories) false @@ -91,7 +92,7 @@ 6385;6340;6246;6011;6387;%(DisableSpecificWarnings) - $(SolutionDir)\src\include;..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\src\include;%(AdditionalIncludeDirectories) false @@ -105,7 +106,7 @@ 6385;6340;6246;6011;6387;%(DisableSpecificWarnings) - $(SolutionDir)\src\include;..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\src\include;%(AdditionalIncludeDirectories) false @@ -121,7 +122,7 @@ 6385;6340;6246;6011;6387;%(DisableSpecificWarnings) - $(SolutionDir)\src\include;..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\src\include;%(AdditionalIncludeDirectories) false diff --git a/src/mod/formats/mod_shout/mod_shout.2015.vcxproj b/src/mod/formats/mod_shout/mod_shout.2015.vcxproj index 53656c5ef7..754a72ac23 100644 --- a/src/mod/formats/mod_shout/mod_shout.2015.vcxproj +++ b/src/mod/formats/mod_shout/mod_shout.2015.vcxproj @@ -47,6 +47,7 @@ v140 + @@ -72,7 +73,7 @@ Disabled - ..\..\..\..\libs\curl-7.35.0\include;../../../../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) + ../../../../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) true EnableFastChecks @@ -94,7 +95,7 @@ Disabled - ..\..\..\..\libs\curl-7.35.0\include;../../../../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) + ../../../../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) true EnableFastChecks @@ -114,7 +115,7 @@ MaxSpeed true - ..\..\..\..\libs\curl-7.35.0\include;../../../../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) + ../../../../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) MultiThreadedDLL true @@ -138,7 +139,7 @@ MaxSpeed true - ..\..\..\..\libs\curl-7.35.0\include;../../../../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) + ../../../../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) MultiThreadedDLL true diff --git a/src/mod/languages/mod_v8/mod_v8.2015.vcxproj b/src/mod/languages/mod_v8/mod_v8.2015.vcxproj index 135a8abc70..8eeab47b18 100644 --- a/src/mod/languages/mod_v8/mod_v8.2015.vcxproj +++ b/src/mod/languages/mod_v8/mod_v8.2015.vcxproj @@ -46,27 +46,25 @@ v140 + + - - - - @@ -91,7 +89,6 @@ Disabled - ..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -112,7 +109,6 @@ Disabled - ..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -130,7 +126,6 @@ - ..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -150,7 +145,6 @@ X64 - ..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories) %(PreprocessorDefinitions) 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 5c2103d361..fe03185da7 100644 --- a/src/mod/languages/mod_v8/mod_v8_skel.2015.vcxproj +++ b/src/mod/languages/mod_v8/mod_v8_skel.2015.vcxproj @@ -46,31 +46,26 @@ v140 + + + - - - - - - - - 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 c971616f1e..b3f3c81236 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 @@ -46,6 +46,7 @@ v140 + @@ -70,7 +71,6 @@ - ..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories) @@ -85,7 +85,6 @@ X64 - ..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories) @@ -98,7 +97,6 @@ - ..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories) @@ -114,7 +112,6 @@ X64 - ..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories) 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 f3be0da242..81c92a620d 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 @@ -46,6 +46,7 @@ v140 + @@ -70,7 +71,6 @@ - ..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories) @@ -86,7 +86,6 @@ X64 - ..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories) @@ -100,7 +99,6 @@ - ..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories) @@ -116,7 +114,6 @@ X64 - ..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories) diff --git a/w32/Library/FreeSwitchCore.2015.vcxproj b/w32/Library/FreeSwitchCore.2015.vcxproj index cb8912dd0c..4a35ab70f2 100644 --- a/w32/Library/FreeSwitchCore.2015.vcxproj +++ b/w32/Library/FreeSwitchCore.2015.vcxproj @@ -48,6 +48,7 @@ + @@ -113,7 +114,7 @@ Disabled - ..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\sqlite-amalgamation-3080401;..\..\libs\pcre-8.34;..\..\libs\speex-1.2rc1\include;..\..\libs\curl-7.35.0\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;..\..\libs\libyuv\include;..\..\libs\freetype\include;..\..\libs\libpng;..\..\libs\libvpx;%(AdditionalIncludeDirectories) + ..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\sqlite-amalgamation-3080401;..\..\libs\pcre-8.34;..\..\libs\speex-1.2rc1\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;..\..\libs\libyuv\include;..\..\libs\freetype\include;..\..\libs\libpng;..\..\libs\libvpx;%(AdditionalIncludeDirectories) CJSON_EXPORT_SYMBOLS;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB;ENABLE_ZRTP;TPL_NOLIB;LIBSOFIA_SIP_UA_STATIC;SWITCH_HAVE_YUV;SWITCH_HAVE_VPX;SWITCH_HAVE_PNG;SWITCH_HAVE_FREETYPE;%(PreprocessorDefinitions) true EnableFastChecks @@ -176,7 +177,7 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs Disabled - ..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\sqlite-amalgamation-3080401;..\..\libs\pcre-8.34;..\..\libs\speex-1.2rc1\include;..\..\libs\curl-7.35.0\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;..\..\libs\libyuv\include;..\..\libs\freetype\include;..\..\libs\libpng;..\..\libs\libvpx;%(AdditionalIncludeDirectories) + ..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\sqlite-amalgamation-3080401;..\..\libs\pcre-8.34;..\..\libs\speex-1.2rc1\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;..\..\libs\libyuv\include;..\..\libs\freetype\include;..\..\libs\libpng;..\..\libs\libvpx;%(AdditionalIncludeDirectories) CJSON_EXPORT_SYMBOLS;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB;ENABLE_ZRTP;TPL_NOLIB;LIBSOFIA_SIP_UA_STATIC;SWITCH_HAVE_YUV;SWITCH_HAVE_VPX;SWITCH_HAVE_PNG;SWITCH_HAVE_FREETYPE;%(PreprocessorDefinitions) true EnableFastChecks @@ -230,7 +231,7 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs MaxSpeed - ..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\sqlite-amalgamation-3080401;..\..\libs\pcre-8.34;..\..\libs\speex-1.2rc1\include;..\..\libs\curl-7.35.0\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;..\..\libs\libyuv\include;..\..\libs\freetype\include;..\..\libs\libpng;..\..\libs\libvpx;%(AdditionalIncludeDirectories) + ..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\sqlite-amalgamation-3080401;..\..\libs\pcre-8.34;..\..\libs\speex-1.2rc1\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;..\..\libs\libyuv\include;..\..\libs\freetype\include;..\..\libs\libpng;..\..\libs\libvpx;%(AdditionalIncludeDirectories) CJSON_EXPORT_SYMBOLS;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;CRASH_PROT;PCRE_STATIC;ENABLE_ZRTP;TPL_NOLIB;LIBSOFIA_SIP_UA_STATIC;SWITCH_HAVE_YUV;SWITCH_HAVE_VPX;SWITCH_HAVE_PNG;SWITCH_HAVE_FREETYPE;%(PreprocessorDefinitions) MultiThreadedDLL Create @@ -281,7 +282,7 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs MaxSpeed - ..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\sqlite-amalgamation-3080401;..\..\libs\pcre-8.34;..\..\libs\speex-1.2rc1\include;..\..\libs\curl-7.35.0\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;..\..\libs\libyuv\include;..\..\libs\freetype\include;..\..\libs\libpng;..\..\libs\libvpx;%(AdditionalIncludeDirectories) + ..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\sqlite-amalgamation-3080401;..\..\libs\pcre-8.34;..\..\libs\speex-1.2rc1\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;..\..\libs\libyuv\include;..\..\libs\freetype\include;..\..\libs\libpng;..\..\libs\libvpx;%(AdditionalIncludeDirectories) CJSON_EXPORT_SYMBOLS;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;CRASH_PROT;PCRE_STATIC;ENABLE_ZRTP;TPL_NOLIB;LIBSOFIA_SIP_UA_STATIC;SWITCH_HAVE_YUV;SWITCH_HAVE_VPX;SWITCH_HAVE_PNG;SWITCH_HAVE_FREETYPE;%(PreprocessorDefinitions) MultiThreadedDLL Create diff --git a/w32/curl-version.props b/w32/curl-version.props new file mode 100644 index 0000000000..0e13f8d88a --- /dev/null +++ b/w32/curl-version.props @@ -0,0 +1,17 @@ + + + + + 7.54.1 + + + true + + + + + + $(cURL_Version) + + + \ No newline at end of file diff --git a/w32/curl.props b/w32/curl.props index c467287680..e591da7aa1 100644 --- a/w32/curl.props +++ b/w32/curl.props @@ -1,11 +1,14 @@  + + + true - $(SolutionDir)libs\curl\include;%(AdditionalIncludeDirectories) + $(SolutionDir)libs\curl-$(cURL_Version)\include;%(AdditionalIncludeDirectories) HAVE_CURL;CURL_STATICLIB;%(PreprocessorDefinitions) diff --git a/w32/curl.vsprops b/w32/curl.vsprops deleted file mode 100644 index 5cc854b7c1..0000000000 --- a/w32/curl.vsprops +++ /dev/null @@ -1,12 +0,0 @@ - - - -