FS-10525: [Build-System] Update curl to 7.54.1 for windows, move to props.

diff --git a/libs/win32/Download CURL.2015.vcxproj b/libs/win32/Download CURL.2015.vcxproj
index 2d6bdf152ebf17629b6da2a83db22c8490f7363d..fcdcfeeb77f124b2ff622f92df2981ec6b23bbbe 100644 (file)
--- a/libs/win32/Download CURL.2015.vcxproj
+++ b/libs/win32/Download CURL.2015.vcxproj
@@ -29,6 +29,7 @@
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
   <Import Project="$(SolutionDir)\w32\extdll.props" />\r
+  <Import Project="$(SolutionDir)\w32\curl-version.props" />\r
   <ImportGroup Label="ExtensionSettings">\r
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">\r
@@ -69,13 +70,13 @@
     <CustomBuild Include="cleancount">\r
       <FileType>Document</FileType>\r
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Downloading Curl.</Message>\r
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">if not exist "$(ProjectDir)..\curl-7.35.0" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/curl-7.35.0.tar.gz "$(ProjectDir).."\r
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">if not exist "$(ProjectDir)..\curl-$(cURL_Version)" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/curl-$(cURL_Version).tar.gz "$(ProjectDir).."\r
 </Command>\r
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\curl-7.35.0;%(Outputs)</Outputs>\r
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\curl-$(cURL_Version);%(Outputs)</Outputs>\r
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Downloading Curl.</Message>\r
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">if not exist "$(ProjectDir)..\curl-7.35.0" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/curl-7.35.0.tar.gz "$(ProjectDir).."\r
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">if not exist "$(ProjectDir)..\curl-$(cURL_Version)" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/curl-$(cURL_Version).tar.gz "$(ProjectDir).."\r
 </Command>\r
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)..\curl-7.35.0;%(Outputs)</Outputs>\r
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)..\curl-$(cURL_Version);%(Outputs)</Outputs>\r
     </CustomBuild>\r
   </ItemGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r

diff --git a/libs/win32/curl/curllib.2015.vcxproj b/libs/win32/curl/curllib.2015.vcxproj
index 2c88aa90d21ab28ca3795330efa030700086694d..a6567c8fda5352de4a46efecfb0183427150fada 100644 (file)
--- a/libs/win32/curl/curllib.2015.vcxproj
+++ b/libs/win32/curl/curllib.2015.vcxproj
@@ -49,27 +49,25 @@
     <PlatformToolset>v140</PlatformToolset>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <Import Project="$(SolutionDir)\w32\curl-version.props" />\r
+  <Import Project="..\..\..\w32\openssl-version.props" />\r
   <ImportGroup Label="ExtensionSettings">\r
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
     <Import Project="..\..\..\w32\extlib.props" />\r
-    <Import Project="..\..\..\w32\openssl-version.props" />\r
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
     <Import Project="..\..\..\w32\extlib.props" />\r
-    <Import Project="..\..\..\w32\openssl-version.props" />\r
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
     <Import Project="..\..\..\w32\extlib.props" />\r
-    <Import Project="..\..\..\w32\openssl-version.props" />\r
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
     <Import Project="..\..\..\w32\extlib.props" />\r
-    <Import Project="..\..\..\w32\openssl-version.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
   <PropertyGroup>\r
@@ -88,7 +86,7 @@
     <ClCompile>\r
       <Optimization>MaxSpeed</Optimization>\r
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
-      <AdditionalIncludeDirectories>..\..\curl-7.35.0\lib\;..\..\curl-7.35.0\include;.;..\..\openssl-$(OpenSSLVersion)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\curl-$(cURL_Version)\lib\;..\..\curl-$(cURL_Version)\include;.;..\..\openssl-$(OpenSSLVersion)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL;USE_SSLEAY;USE_OPENSSL;CURL_DISABLE_LDAP;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <StringPooling>true</StringPooling>\r
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
@@ -119,7 +117,7 @@
     <ClCompile>\r
       <Optimization>MaxSpeed</Optimization>\r
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
-      <AdditionalIncludeDirectories>..\..\curl-7.35.0\lib\;..\..\curl-7.35.0\include;.;..\..\openssl-$(OpenSSLVersion)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\curl-$(cURL_Version)\lib\;..\..\curl-$(cURL_Version)\include;.;..\..\openssl-$(OpenSSLVersion)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL;USE_SSLEAY;USE_OPENSSL;CURL_DISABLE_LDAP;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <StringPooling>true</StringPooling>\r
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
@@ -149,7 +147,7 @@
     </Midl>\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>..\..\curl-7.35.0\lib\;..\..\curl-7.35.0\include;.;..\..\openssl-$(OpenSSLVersion)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\curl-$(cURL_Version)\lib\;..\..\curl-$(cURL_Version)\include;.;..\..\openssl-$(OpenSSLVersion)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL;USE_SSLEAY;USE_OPENSSL;CURL_DISABLE_LDAP;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <MinimalRebuild>true</MinimalRebuild>\r
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
@@ -179,7 +177,7 @@
     </Midl>\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>..\..\curl-7.35.0\lib\;..\..\curl-7.35.0\include;.;..\..\openssl-$(OpenSSLVersion)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\curl-$(cURL_Version)\lib\;..\..\curl-$(cURL_Version)\include;.;..\..\openssl-$(OpenSSLVersion)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL;USE_SSLEAY;USE_OPENSSL;CURL_DISABLE_LDAP;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <MinimalRebuild>true</MinimalRebuild>\r
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
@@ -198,141 +196,248 @@
     </Bscmake>\r
   </ItemDefinitionGroup>\r
   <ItemGroup>\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\asyn-ares.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\asyn-thread.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\base64.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\bundles.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\conncache.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\connect.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\content_encoding.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\cookie.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\curl_addrinfo.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\curl_fnmatch.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\curl_gethostname.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\curl_gssapi.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\curl_memrchr.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\curl_multibyte.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\curl_ntlm.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\curl_ntlm_core.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\curl_ntlm_msgs.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\curl_ntlm_wb.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\curl_rtmp.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\curl_sasl.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\curl_threads.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\dict.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\dotdot.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\easy.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\escape.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\file.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\fileinfo.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\formdata.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\ftp.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\ftplistparser.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\getenv.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\getinfo.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\gopher.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\hash.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\hmac.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\hostasyn.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\hostcheck.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\hostip.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\hostip4.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\hostip6.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\hostsyn.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\http.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\http_chunks.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\http_digest.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\http_negotiate.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\http_proxy.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\if2ip.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\imap.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\inet_ntop.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\inet_pton.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\ldap.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\llist.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\md5.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\memdebug.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\mprintf.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\multi.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\netrc.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\non-ascii.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\nonblock.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\parsedate.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\pingpong.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\pipeline.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\pop3.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\progress.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\rawstr.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\rtsp.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\security.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\select.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\sendf.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\share.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\slist.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\smtp.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\socks.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\speedcheck.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\splay.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\strequal.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\strerror.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\strtok.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\strtoofft.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\telnet.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\tftp.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\timeval.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\transfer.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\url.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\version.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\vtls\openssl.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\vtls\vtls.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\warnless.c" />\r
-    <ClCompile Include="..\..\curl-7.35.0\lib\wildcard.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\amigaos.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\asyn-ares.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\asyn-thread.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\base64.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\conncache.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\connect.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\content_encoding.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\cookie.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_addrinfo.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_des.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_endian.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_fnmatch.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_gethostname.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_gssapi.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_memrchr.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_multibyte.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_ntlm_core.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_ntlm_wb.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_rtmp.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_sasl.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_sspi.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_threads.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\dict.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\dotdot.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\easy.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\escape.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\file.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\fileinfo.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\formdata.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\ftp.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\ftplistparser.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\getenv.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\getinfo.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\gopher.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\hash.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\hmac.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\hostasyn.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\hostcheck.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\hostip4.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\hostip6.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\hostip.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\hostsyn.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\http2.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\http.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\http_chunks.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\http_digest.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\http_negotiate.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\http_ntlm.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\http_proxy.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\idn_win32.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\if2ip.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\imap.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\inet_ntop.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\inet_pton.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\krb5.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\ldap.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\llist.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\md4.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\md5.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\memdebug.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\mprintf.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\multi.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\netrc.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\non-ascii.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\nonblock.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\openldap.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\parsedate.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\pingpong.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\pipeline.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\pop3.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\progress.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\rand.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\rtsp.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\security.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\select.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\sendf.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\share.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\slist.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\smb.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\smtp.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\socks.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\socks_gssapi.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\socks_sspi.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\speedcheck.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\splay.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\ssh.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\strcase.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\strdup.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\strerror.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\strtok.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\strtoofft.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\system_win32.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\telnet.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\tftp.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\timeval.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\transfer.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\url.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\version.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\warnless.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\wildcard.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\x509asn1.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vauth\cleartext.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vauth\cram.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vauth\digest.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vauth\digest_sspi.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vauth\krb5_gssapi.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vauth\krb5_sspi.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vauth\ntlm.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vauth\ntlm_sspi.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vauth\oauth2.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vauth\spnego_gssapi.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vauth\spnego_sspi.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vauth\vauth.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vtls\axtls.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vtls\cyassl.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vtls\darwinssl.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vtls\gskit.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vtls\gtls.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vtls\mbedtls.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vtls\nss.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vtls\openssl.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vtls\polarssl.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vtls\polarssl_threadlock.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vtls\schannel.c" />\r
+    <ClCompile Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vtls\vtls.c" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\arpa_telnet.h" />\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\config-mac.h" />\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\config-win32.h" />\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\connect.h" />\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\content_encoding.h" />\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\cookie.h" />\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\curlx.h" />\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\dict.h" />\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\easyif.h" />\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\escape.h" />\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\file.h" />\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\formdata.h" />\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\ftp.h" />\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\getinfo.h" />\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\hash.h" />\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\hostip.h" />\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\http.h" />\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\http_chunks.h" />\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\http_digest.h" />\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\http_negotiate.h" />\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\if2ip.h" />\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\inet_ntop.h" />\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\inet_pton.h" />\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\llist.h" />\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\memdebug.h" />\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\multiif.h" />\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\netrc.h" />\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\parsedate.h" />\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\progress.h" />\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\select.h" />\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\sendf.h" />\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\share.h" />\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\sockaddr.h" />\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\speedcheck.h" />\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\strequal.h" />\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\strerror.h" />\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\strtok.h" />\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\strtoofft.h" />\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\telnet.h" />\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\tftp.h" />\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\timeval.h" />\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\transfer.h" />\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\url.h" />\r
-    <ClInclude Include="..\..\curl-7.35.0\lib\urldata.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\amigaos.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\arpa_telnet.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\asyn.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\config-win32.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\conncache.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\connect.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\content_encoding.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\cookie.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_addrinfo.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_base64.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_des.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_endian.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_fnmatch.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_gethostname.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_gssapi.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_hmac.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_ldap.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_md4.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_md5.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_memory.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_memrchr.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_multibyte.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_ntlm_core.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_ntlm_wb.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_printf.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_rtmp.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_sasl.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_sec.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_setup.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_setup_once.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_sspi.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curl_threads.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\curlx.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\dict.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\dotdot.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\easyif.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\escape.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\file.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\fileinfo.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\formdata.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\ftp.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\ftplistparser.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\getinfo.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\gopher.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\hash.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\hostcheck.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\hostip.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\http2.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\http_chunks.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\http_digest.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\http.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\http_negotiate.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\http_ntlm.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\http_proxy.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\if2ip.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\imap.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\inet_ntop.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\inet_pton.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\llist.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\memdebug.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\multihandle.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\multiif.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\netrc.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\non-ascii.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\nonblock.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\parsedate.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\pingpong.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\pipeline.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\pop3.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\progress.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\rand.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\rtsp.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\select.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\sendf.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\setup-vms.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\share.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\sigpipe.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\slist.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\smb.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\smtp.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\sockaddr.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\socks.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\speedcheck.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\splay.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\ssh.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\strcase.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\strdup.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\strerror.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\strtok.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\strtoofft.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\system_win32.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\telnet.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\tftp.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\timeval.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\transfer.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\urldata.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\url.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\warnless.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\wildcard.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\x509asn1.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vauth\digest.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vauth\ntlm.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vauth\vauth.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vtls\axtls.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vtls\cyassl.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vtls\darwinssl.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vtls\gskit.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vtls\gtls.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vtls\mbedtls.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vtls\nssg.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vtls\openssl.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vtls\polarssl.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vtls\polarssl_threadlock.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vtls\schannel.h" />\r
+    <ClInclude Include="$(SolutionDir)libs\curl-$(cURL_Version)\lib\vtls\vtls.h" />\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ProjectReference Include="..\Download CURL.2015.vcxproj">\r

diff --git a/src/mod/applications/mod_curl/mod_curl.2015.vcxproj b/src/mod/applications/mod_curl/mod_curl.2015.vcxproj
index 356dc76a02c3a52a0e0763a8560cb60c5500922b..7559a4535e059e42cb0bbd7d077d4c754a5d705c 100644 (file)
--- a/src/mod/applications/mod_curl/mod_curl.2015.vcxproj
+++ b/src/mod/applications/mod_curl/mod_curl.2015.vcxproj
@@ -46,6 +46,7 @@
     <PlatformToolset>v140</PlatformToolset>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <Import Project="$(SolutionDir)\w32\curl.props" />\r
   <ImportGroup Label="ExtensionSettings">\r
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">\r
@@ -70,7 +71,6 @@
   </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <ClCompile>\r
-      <AdditionalIncludeDirectories>%(RootDir)%(Directory)..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
@@ -86,7 +86,6 @@
       <TargetEnvironment>X64</TargetEnvironment>\r
     </Midl>\r
     <ClCompile>\r
-      <AdditionalIncludeDirectories>%(RootDir)%(Directory)..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
@@ -100,7 +99,6 @@
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
     <ClCompile>\r
-      <AdditionalIncludeDirectories>%(RootDir)%(Directory)..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
@@ -116,7 +114,6 @@
       <TargetEnvironment>X64</TargetEnvironment>\r
     </Midl>\r
     <ClCompile>\r
-      <AdditionalIncludeDirectories>%(RootDir)%(Directory)..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r

diff --git a/src/mod/applications/mod_httapi/mod_httapi.2015.vcxproj b/src/mod/applications/mod_httapi/mod_httapi.2015.vcxproj
index 2d4a04b13a5f189024a303617651d91ab0003af3..30c314c7e26e5ec95ebcd691ddda1492b00c9819 100644 (file)
--- a/src/mod/applications/mod_httapi/mod_httapi.2015.vcxproj
+++ b/src/mod/applications/mod_httapi/mod_httapi.2015.vcxproj
@@ -46,6 +46,7 @@
     <PlatformToolset>v140</PlatformToolset>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <Import Project="$(SolutionDir)\w32\curl.props" />\r
   <ImportGroup Label="ExtensionSettings">\r
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">\r
@@ -73,7 +74,7 @@
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
       <DisableSpecificWarnings>4456;6053;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
-      <AdditionalIncludeDirectories>$(SolutionDir)\src\include;..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>$(SolutionDir)\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
     </ClCompile>\r
     <Link>\r
       <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
@@ -89,7 +90,7 @@
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
       <DisableSpecificWarnings>4456;6053;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
-      <AdditionalIncludeDirectories>$(SolutionDir)\src\include;..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>$(SolutionDir)\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
     </ClCompile>\r
     <Link>\r
       <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
@@ -103,7 +104,7 @@
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
       <DisableSpecificWarnings>4456;6053;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
-      <AdditionalIncludeDirectories>$(SolutionDir)\src\include;..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>$(SolutionDir)\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
     </ClCompile>\r
     <Link>\r
       <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
@@ -119,7 +120,7 @@
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
       <DisableSpecificWarnings>4456;6053;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
-      <AdditionalIncludeDirectories>$(SolutionDir)\src\include;..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>$(SolutionDir)\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
     </ClCompile>\r
     <Link>\r
       <RandomizedBaseAddress>false</RandomizedBaseAddress>\r

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 1e00d0e35f8b61831061ea0a2a2467f9764e406e..9c260e6991f2d47e3ba8d52be7fb1e5aac99ed35 100644 (file)
--- 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 @@
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />  
   <Import Project="$(SolutionDir)\w32\openssl.props" />
+  <Import Project="$(SolutionDir)\w32\curl.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
@@ -71,7 +72,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)\src\include;$(SolutionDir)libs\curl-7.35.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PrecompiledHeader>
       </PrecompiledHeader>
     </ClCompile>
@@ -86,7 +87,7 @@
       <TargetEnvironment>X64</TargetEnvironment>
     </Midl>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)\src\include;$(SolutionDir)\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PrecompiledHeader>
       </PrecompiledHeader>
     </ClCompile>
@@ -99,7 +100,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)\src\include;$(SolutionDir)\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PrecompiledHeader>
       </PrecompiledHeader>
     </ClCompile>
@@ -114,7 +115,7 @@
       <TargetEnvironment>X64</TargetEnvironment>
     </Midl>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)\src\include;$(SolutionDir)\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PrecompiledHeader>
       </PrecompiledHeader>
     </ClCompile>

diff --git a/src/mod/applications/mod_snom/mod_snom.2015.vcxproj b/src/mod/applications/mod_snom/mod_snom.2015.vcxproj
index 969e8ddcbe6729266d0aec7c2e151b8efb6497d4..3e5288b0d30f26d388c016cd6106d913a8a14825 100644 (file)
--- a/src/mod/applications/mod_snom/mod_snom.2015.vcxproj
+++ b/src/mod/applications/mod_snom/mod_snom.2015.vcxproj
@@ -46,6 +46,7 @@
     <PlatformToolset>v140</PlatformToolset>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <Import Project="$(SolutionDir)\w32\curl.props" />\r
   <ImportGroup Label="ExtensionSettings">\r
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">\r
@@ -74,7 +75,7 @@
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
       <DisableSpecificWarnings>6385;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
-      <AdditionalIncludeDirectories>$(SolutionDir)\src\include;..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>$(SolutionDir)\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
     </ClCompile>\r
     <Link>\r
       <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
@@ -91,7 +92,7 @@
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
       <DisableSpecificWarnings>6385;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
-      <AdditionalIncludeDirectories>$(SolutionDir)\src\include;..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>$(SolutionDir)\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
     </ClCompile>\r
     <Link>\r
       <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
@@ -105,7 +106,7 @@
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
       <DisableSpecificWarnings>6385;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
-      <AdditionalIncludeDirectories>$(SolutionDir)\src\include;..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>$(SolutionDir)\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
     </ClCompile>\r
     <Link>\r
       <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
@@ -121,7 +122,7 @@
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
       <DisableSpecificWarnings>6385;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
-      <AdditionalIncludeDirectories>$(SolutionDir)\src\include;..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>$(SolutionDir)\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
     </ClCompile>\r
     <Link>\r
       <RandomizedBaseAddress>false</RandomizedBaseAddress>\r

diff --git a/src/mod/formats/mod_shout/mod_shout.2015.vcxproj b/src/mod/formats/mod_shout/mod_shout.2015.vcxproj
index 53656c5ef7a8c8686571f153fe089a6217b23403..754a72ac23d41b3ca0b55f2a47c2326226d0b212 100644 (file)
--- a/src/mod/formats/mod_shout/mod_shout.2015.vcxproj
+++ b/src/mod/formats/mod_shout/mod_shout.2015.vcxproj
@@ -47,6 +47,7 @@
     <PlatformToolset>v140</PlatformToolset>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <Import Project="$(SolutionDir)\w32\curl.props" />\r
   <ImportGroup Label="ExtensionSettings">\r
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">\r
@@ -72,7 +73,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>..\..\..\..\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)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>../../../../libs/lame-3.98.4/include;..\..\..\..\libs\win32\libshout;..\..\..\..\libs\libshout-2.2.2\include;..\..\..\..\libs\mpg123\src;..\..\..\..\libs\win32\mpg123;..\..\..\..\libs\win32\mpg123\libmpg123;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>_TIMESPEC_DEFINED;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <MinimalRebuild>true</MinimalRebuild>\r
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
@@ -94,7 +95,7 @@
     </Midl>\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>..\..\..\..\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)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>../../../../libs/lame-3.98.4/include;..\..\..\..\libs\win32\libshout;..\..\..\..\libs\libshout-2.2.2\include;..\..\..\..\libs\mpg123\src;..\..\..\..\libs\win32\mpg123;..\..\..\..\libs\win32\mpg123\libmpg123;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <MinimalRebuild>true</MinimalRebuild>\r
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
@@ -114,7 +115,7 @@
     <ClCompile>\r
       <Optimization>MaxSpeed</Optimization>\r
       <IntrinsicFunctions>true</IntrinsicFunctions>\r
-      <AdditionalIncludeDirectories>..\..\..\..\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)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>../../../../libs/lame-3.98.4/include;..\..\..\..\libs\win32\libshout;..\..\..\..\libs\libshout-2.2.2\include;..\..\..\..\libs\mpg123\src;..\..\..\..\libs\win32\mpg123;..\..\..\..\libs\win32\mpg123\libmpg123;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>_TIMESPEC_DEFINED;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
@@ -138,7 +139,7 @@
     <ClCompile>\r
       <Optimization>MaxSpeed</Optimization>\r
       <IntrinsicFunctions>true</IntrinsicFunctions>\r
-      <AdditionalIncludeDirectories>..\..\..\..\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)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>../../../../libs/lame-3.98.4/include;..\..\..\..\libs\win32\libshout;..\..\..\..\libs\libshout-2.2.2\include;..\..\..\..\libs\mpg123\src;..\..\..\..\libs\win32\mpg123;..\..\..\..\libs\win32\mpg123\libmpg123;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r

diff --git a/src/mod/languages/mod_v8/mod_v8.2015.vcxproj b/src/mod/languages/mod_v8/mod_v8.2015.vcxproj
index 135a8abc70d1d233740beeb270ac6ec333b2a505..8eeab47b18bb78b9bf2c434ec1e325a991a89c6c 100644 (file)
--- a/src/mod/languages/mod_v8/mod_v8.2015.vcxproj
+++ b/src/mod/languages/mod_v8/mod_v8.2015.vcxproj
@@ -46,27 +46,25 @@
     <PlatformToolset>v140</PlatformToolset>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <Import Project="$(SolutionDir)\w32\curl.props" />\r
+  <Import Project="$(SolutionDir)\w32\v8.props" />\r
   <ImportGroup Label="ExtensionSettings">\r
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
     <Import Project="..\..\..\..\w32\module_release.props" />\r
-    <Import Project="..\..\..\..\w32\v8.props" />\r
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
     <Import Project="..\..\..\..\w32\module_debug.props" />\r
-    <Import Project="..\..\..\..\w32\v8.props" />\r
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
     <Import Project="..\..\..\..\w32\module_release.props" />\r
-    <Import Project="..\..\..\..\w32\v8.props" />\r
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
     <Import Project="..\..\..\..\w32\module_debug.props" />\r
-    <Import Project="..\..\..\..\w32\v8.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
   <PropertyGroup>\r
@@ -91,7 +89,6 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
@@ -112,7 +109,6 @@
     </Midl>\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
@@ -130,7 +126,6 @@
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
     <ClCompile>\r
-      <AdditionalIncludeDirectories>..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
@@ -150,7 +145,6 @@
       <TargetEnvironment>X64</TargetEnvironment>\r
     </Midl>\r
     <ClCompile>\r
-      <AdditionalIncludeDirectories>..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r

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 5c2103d3618034f7db3c0ea811ff78c3ab6c3db1..fe03185da72e9ad13e941bbaba071e1d902c67a0 100644 (file)
--- 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 @@
     <PlatformToolset>v140</PlatformToolset>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <Import Project="$(SolutionDir)\w32\curl.props" />\r
+  <Import Project="$(SolutionDir)\w32\v8.props" />\r
+  <Import Project="$(SolutionDir)\w32\winlibs.props" />\r
   <ImportGroup Label="ExtensionSettings">\r
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-    <Import Project="..\..\..\..\w32\winlibs.props" />\r
     <Import Project="..\..\..\..\w32\module_release.props" />\r
-    <Import Project="..\..\..\..\w32\v8.props" />\r
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-    <Import Project="..\..\..\..\w32\winlibs.props" />\r
     <Import Project="..\..\..\..\w32\module_debug.props" />\r
-    <Import Project="..\..\..\..\w32\v8.props" />\r
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-    <Import Project="..\..\..\..\w32\winlibs.props" />\r
     <Import Project="..\..\..\..\w32\module_release.props" />\r
-    <Import Project="..\..\..\..\w32\v8.props" />\r
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-    <Import Project="..\..\..\..\w32\winlibs.props" />\r
     <Import Project="..\..\..\..\w32\module_debug.props" />\r
-    <Import Project="..\..\..\..\w32\v8.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
   <PropertyGroup>\r

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 c971616f1e7172c8bf5e7b69f4f0e0146ea81b88..b3f3c812363540b1687a3c9d3c167152a3b33627 100644 (file)
--- 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 @@
     <PlatformToolset>v140</PlatformToolset>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <Import Project="$(SolutionDir)\w32\curl.props" />\r
   <ImportGroup Label="ExtensionSettings">\r
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">\r
@@ -70,7 +71,6 @@
   </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <ClCompile>\r
-      <AdditionalIncludeDirectories>..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
     </ClCompile>\r
@@ -85,7 +85,6 @@
       <TargetEnvironment>X64</TargetEnvironment>\r
     </Midl>\r
     <ClCompile>\r
-      <AdditionalIncludeDirectories>..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
     </ClCompile>\r
@@ -98,7 +97,6 @@
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
     <ClCompile>\r
-      <AdditionalIncludeDirectories>..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
     </ClCompile>\r
@@ -114,7 +112,6 @@
       <TargetEnvironment>X64</TargetEnvironment>\r
     </Midl>\r
     <ClCompile>\r
-      <AdditionalIncludeDirectories>..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
     </ClCompile>\r

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 f3be0da2426e97366c64118ff35155a52cf270c5..81c92a620d24dd5297b83c7a94ec21322bb85b50 100644 (file)
--- 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 @@
     <PlatformToolset>v140</PlatformToolset>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <Import Project="$(SolutionDir)\w32\curl.props" />\r
   <ImportGroup Label="ExtensionSettings">\r
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">\r
@@ -70,7 +71,6 @@
   </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <ClCompile>\r
-      <AdditionalIncludeDirectories>..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
     </ClCompile>\r
@@ -86,7 +86,6 @@
       <TargetEnvironment>X64</TargetEnvironment>\r
     </Midl>\r
     <ClCompile>\r
-      <AdditionalIncludeDirectories>..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
     </ClCompile>\r
@@ -100,7 +99,6 @@
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
     <ClCompile>\r
-      <AdditionalIncludeDirectories>..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
     </ClCompile>\r
@@ -116,7 +114,6 @@
       <TargetEnvironment>X64</TargetEnvironment>\r
     </Midl>\r
     <ClCompile>\r
-      <AdditionalIncludeDirectories>..\..\..\..\libs\curl-7.35.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
     </ClCompile>\r

diff --git a/w32/Library/FreeSwitchCore.2015.vcxproj b/w32/Library/FreeSwitchCore.2015.vcxproj
index cb8912dd0cbc096744854bc27c93b77075c95ccc..4a35ab70f2ae1aa93144a3ad4bde05c48f2be818 100644 (file)
--- a/w32/Library/FreeSwitchCore.2015.vcxproj
+++ b/w32/Library/FreeSwitchCore.2015.vcxproj
@@ -48,6 +48,7 @@
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
   <Import Project="$(SolutionDir)\w32\openssl.props" />\r
+  <Import Project="$(SolutionDir)\w32\curl.props" />\r
   <ImportGroup Label="ExtensionSettings">\r
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">\r
@@ -113,7 +114,7 @@
     </PreBuildEvent>\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <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\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)</AdditionalIncludeDirectories>\r
+      <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)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>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)</PreprocessorDefinitions>\r
       <MinimalRebuild>true</MinimalRebuild>\r
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
@@ -176,7 +177,7 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
     </Midl>\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <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\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)</AdditionalIncludeDirectories>\r
+      <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)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>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)</PreprocessorDefinitions>\r
       <MinimalRebuild>true</MinimalRebuild>\r
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
@@ -230,7 +231,7 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
     </PreBuildEvent>\r
     <ClCompile>\r
       <Optimization>MaxSpeed</Optimization>\r
-      <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\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)</AdditionalIncludeDirectories>\r
+      <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)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>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)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
       <PrecompiledHeader>Create</PrecompiledHeader>\r
@@ -281,7 +282,7 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
     </Midl>\r
     <ClCompile>\r
       <Optimization>MaxSpeed</Optimization>\r
-      <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\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)</AdditionalIncludeDirectories>\r
+      <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)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>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)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
       <PrecompiledHeader>Create</PrecompiledHeader>\r

diff --git a/w32/curl-version.props b/w32/curl-version.props
new file mode 100644 (file)
index 0000000..0e13f8d
--- /dev/null
+++ b/w32/curl-version.props
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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>
+  </PropertyGroup>
+  <PropertyGroup>
+    <cURL_VersionImported>true</cURL_VersionImported>
+  </PropertyGroup>
+  <PropertyGroup />
+  <ItemDefinitionGroup />
+  <ItemGroup>
+    <BuildMacro Include="cURL_Version">
+      <Value>$(cURL_Version)</Value>
+    </BuildMacro>
+  </ItemGroup>
+</Project>
\ No newline at end of file

diff --git a/w32/curl.props b/w32/curl.props
index c4672876805c5400df100c7522b2940a2e243c36..e591da7aa1cf2e489618bf575f73a50030dbaa42 100644 (file)
--- a/w32/curl.props
+++ b/w32/curl.props
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ImportGroup Label="PropertySheets">\r
+    <Import Project="curl-version.props" Condition=" '$(cURL_VersionImported)' == '' "/>\r
+  </ImportGroup>\r
   <PropertyGroup>\r
     <CurlPropsImported>true</CurlPropsImported>\r
   </PropertyGroup>\r
   <ItemDefinitionGroup>\r
     <ClCompile>\r
-      <AdditionalIncludeDirectories>$(SolutionDir)libs\curl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>$(SolutionDir)libs\curl-$(cURL_Version)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>HAVE_CURL;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
     </ClCompile>\r
   </ItemDefinitionGroup>\r

diff --git a/w32/curl.vsprops b/w32/curl.vsprops
deleted file mode 100644 (file)
index 5cc854b..0000000
--- a/w32/curl.vsprops
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>\r
-<VisualStudioPropertySheet\r
-       ProjectType="Visual C++"\r
-       Version="8.00"\r
-       Name="curl"\r
-       >\r
-       <Tool\r
-               Name="VCCLCompilerTool"\r
-               AdditionalIncludeDirectories="$(SolutionDir)libs\curl\include"\r
-               PreprocessorDefinitions="HAVE_CURL;CURL_STATICLIB"\r
-       />\r
-</VisualStudioPropertySheet>\r