FS-3728 --resolve thanks

diff --git a/libs/freetdm/mod_freetdm/mod_freetdm.2008.vcproj b/libs/freetdm/mod_freetdm/mod_freetdm.2008.vcproj
index 5ed38903e7c1bd2907429ababbf26b996c3f5ae5..3fdd92af0524b6b422f7880269ba1145cd68cb00 100644 (file)
--- a/libs/freetdm/mod_freetdm/mod_freetdm.2008.vcproj
+++ b/libs/freetdm/mod_freetdm/mod_freetdm.2008.vcproj
@@ -45,7 +45,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../../src/include;../src/include;../src/isdn/include"
+                               AdditionalIncludeDirectories="../../../src/include;../src/include;../../curl/include;../src/isdn/include"
                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
@@ -126,7 +126,7 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="../../../src/include;../src/include;../src/isdn/include"
+                               AdditionalIncludeDirectories="../../../src/include;../src/include;../../curl/include;../src/isdn/include"
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
@@ -210,7 +210,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../../src/include;../src/include;../src/isdn/include"
+                               AdditionalIncludeDirectories="../../../src/include;../src/include;../../curl/include;../src/isdn/include"
                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
@@ -292,7 +292,7 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="../../../src/include;../src/include;../src/isdn/include"
+                               AdditionalIncludeDirectories="../../../src/include;../src/include;../../curl/include;../src/isdn/include"
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"

diff --git a/libs/freetdm/mod_freetdm/mod_freetdm.2010.vcxproj b/libs/freetdm/mod_freetdm/mod_freetdm.2010.vcxproj
index ec693334100bfd4cf9c14e930c0c4f92e06c197c..e630effad6a0826a6725a52f75e80c2fdd19e604 100644 (file)
--- a/libs/freetdm/mod_freetdm/mod_freetdm.2010.vcxproj
+++ b/libs/freetdm/mod_freetdm/mod_freetdm.2010.vcxproj
@@ -91,7 +91,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>../../../src/include;../src/include;../src/isdn/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>../../../src/include;../src/include;../../curl/include;../src/isdn/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <MinimalRebuild>true</MinimalRebuild>\r
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
@@ -117,7 +117,7 @@
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
     <ClCompile>\r
-      <AdditionalIncludeDirectories>../../../src/include;../src/include;../src/isdn/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>../../../src/include;../src/include;../../curl/include;../src/isdn/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
       <PrecompiledHeader>\r
@@ -148,7 +148,7 @@
     </Midl>\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>../../../src/include;../src/include;../src/isdn/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>../../../src/include;../src/include;../../curl/include;../src/isdn/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <MinimalRebuild>true</MinimalRebuild>\r
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
@@ -177,7 +177,7 @@
       <TargetEnvironment>X64</TargetEnvironment>\r
     </Midl>\r
     <ClCompile>\r
-      <AdditionalIncludeDirectories>../../../src/include;../src/include;../src/isdn/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>../../../src/include;../src/include;../../curl/include;../src/isdn/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
       <PrecompiledHeader>\r

diff --git a/w32/Library/FreeSwitchCore.2008.vcproj b/w32/Library/FreeSwitchCore.2008.vcproj
index 6ba5b95959fb83e1324cb90729eb90c38e9c909c..08c7b298f1c240461816223a41820eb817c1059b 100644 (file)
--- a/w32/Library/FreeSwitchCore.2008.vcproj
+++ b/w32/Library/FreeSwitchCore.2008.vcproj
@@ -690,6 +690,10 @@
                                        />\r
                                </FileConfiguration>\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\switch_curl.c"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\switch_dso.c"\r
                                >\r

diff --git a/w32/winlibs.vsprops b/w32/winlibs.vsprops
index c5ec630f3c66419b286038d102f6089301ccbf0d..00ee4b0381418bb5f6dd9195aefa5a66e89bca12 100644 (file)
--- a/w32/winlibs.vsprops
+++ b/w32/winlibs.vsprops
@@ -3,6 +3,7 @@
        ProjectType="Visual C++"\r
        Version="8.00"\r
        Name="Freeswitch Core Windows Libraries"\r
+       InheritedPropertySheets=".\curl.vsprops"\r
        >\r
        <Tool\r
                Name="VCLinkerTool"\r