FS-5272 --resolve

diff --git a/libs/libzrtp/projects/win/libzrtp.2012.vcxproj b/libs/libzrtp/projects/win/libzrtp.2012.vcxproj
index 5ae458554b6a542e9e6dff59207cbcff92367d10..a570f8139c5cdf4a22b3cb8fd11aefac7faf417c 100644 (file)
--- a/libs/libzrtp/projects/win/libzrtp.2012.vcxproj
+++ b/libs/libzrtp/projects/win/libzrtp.2012.vcxproj
@@ -174,7 +174,6 @@
     <ClInclude Include="..\..\include\zrtp_engine.h" />\r
     <ClInclude Include="..\..\include\zrtp_error.h" />\r
     <ClInclude Include="..\..\include\zrtp_iface.h" />\r
-    <ClInclude Include="..\..\include\zrtp_iface_builtin.h" />\r
     <ClInclude Include="..\..\include\zrtp_iface_cache.h" />\r
     <ClInclude Include="..\..\include\zrtp_iface_system.h" />\r
     <ClInclude Include="..\..\include\zrtp_legal.h" />\r
@@ -186,7 +185,6 @@
     <ClInclude Include="..\..\include\zrtp_srtp_builtin.h" />\r
     <ClInclude Include="..\..\include\zrtp_string.h" />\r
     <ClInclude Include="..\..\include\zrtp_types.h" />\r
-    <ClInclude Include="..\..\include\zrtp_utils.h" />\r
     <ClInclude Include="..\..\include\zrtp_version.h" />\r
     <ClInclude Include="..\..\third_party\bnlib\bn.h" />\r
     <ClInclude Include="..\..\third_party\bnlib\bn32.h" />\r

diff --git a/libs/libzrtp/projects/win/libzrtp.2012.vcxproj.filters b/libs/libzrtp/projects/win/libzrtp.2012.vcxproj.filters
index 7e1165d4b3c7b4f511e30332e5c0582c226009a1..1798a42c32dd0c71c242d5ddfd7deec7c6ef0b63 100644 (file)
--- a/libs/libzrtp/projects/win/libzrtp.2012.vcxproj.filters
+++ b/libs/libzrtp/projects/win/libzrtp.2012.vcxproj.filters
@@ -45,9 +45,6 @@
     <ClInclude Include="..\..\include\zrtp_iface.h">\r
       <Filter>include</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\..\include\zrtp_iface_builtin.h">\r
-      <Filter>include</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="..\..\include\zrtp_iface_cache.h">\r
       <Filter>include</Filter>\r
     </ClInclude>\r
@@ -81,9 +78,6 @@
     <ClInclude Include="..\..\include\zrtp_types.h">\r
       <Filter>include</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\..\include\zrtp_utils.h">\r
-      <Filter>include</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="..\..\include\zrtp_version.h">\r
       <Filter>include</Filter>\r
     </ClInclude>\r

diff --git a/libs/win32/Download OPENSSL.2012.vcxproj b/libs/win32/Download OPENSSL.2012.vcxproj
index 954e6dd87b8d869d37473ef889207f11c642733c..f230e455158b839acaba774ada4d3953587ea9c4 100644 (file)
--- a/libs/win32/Download OPENSSL.2012.vcxproj
+++ b/libs/win32/Download OPENSSL.2012.vcxproj
@@ -51,7 +51,7 @@
     </BuildLog>\r
   </ItemDefinitionGroup>\r
   <ItemGroup>\r
-    <CustomBuild Include="OPENSSL\cleancount">\r
+    <CustomBuild Include="cleancount">\r
       <FileType>Document</FileType>\r
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Downloading OPENSSL</Message>\r
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">if not exist "$(ProjectDir)..\openssl-1.0.1c" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/openssl-1.0.1c.tar.gz "$(ProjectDir).."\r

diff --git a/libs/win32/curl/curllib.2012.vcxproj b/libs/win32/curl/curllib.2012.vcxproj
index a30ff78f25a03b7d4209cc48d883b9fbd4b73230..c6f519ff3e35c221d54c704c67b7a06bc3168a73 100644 (file)
--- a/libs/win32/curl/curllib.2012.vcxproj
+++ b/libs/win32/curl/curllib.2012.vcxproj
@@ -256,7 +256,6 @@
   <ItemGroup>\r
     <ClInclude Include="..\..\curl\lib\arpa_telnet.h" />\r
     <ClInclude Include="..\..\curl\lib\base64.h" />\r
-    <ClInclude Include="..\..\curl\lib\ca-bundle.h" />\r
     <ClInclude Include="..\..\curl\lib\config-win32.h" />\r
     <ClInclude Include="..\..\curl\lib\connect.h" />\r
     <ClInclude Include="..\..\curl\lib\content_encoding.h" />\r

diff --git a/libs/win32/curl/curllib.2012.vcxproj.filters b/libs/win32/curl/curllib.2012.vcxproj.filters
index 5b35d44edf283bb2f337de65e6627c5b5ec89901..e527b1ce005d549028d0a71c3c7a14e6b54da425 100644 (file)
--- a/libs/win32/curl/curllib.2012.vcxproj.filters
+++ b/libs/win32/curl/curllib.2012.vcxproj.filters
@@ -195,9 +195,6 @@
     <ClInclude Include="..\..\curl\lib\base64.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\..\curl\lib\ca-bundle.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="..\..\curl\lib\config-win32.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r

diff --git a/libs/win32/openssl/libeay32.2012.vcxproj b/libs/win32/openssl/libeay32.2012.vcxproj
index c8bbc8095d448a64d7b6dd873efa606db4d8e9ef..01a28694ca35ebda2ab2f119cdce41e860457297 100644 (file)
--- a/libs/win32/openssl/libeay32.2012.vcxproj
+++ b/libs/win32/openssl/libeay32.2012.vcxproj
@@ -855,7 +855,6 @@ if not exist "$(ProjectDir)..\..\openssl-1.0.1c\include\openssl\e_os.h" xcopy "$
     <ClInclude Include="..\..\openssl-1.0.1c\include\openssl\obj_mac.h" />\r
     <ClInclude Include="..\..\openssl-1.0.1c\include\openssl\objects.h" />\r
     <ClInclude Include="..\..\openssl-1.0.1c\include\openssl\ocsp.h" />\r
-    <ClInclude Include="..\..\openssl-1.0.1c\opensslconf.h" />\r
     <ClInclude Include="..\..\openssl-1.0.1c\include\openssl\opensslv.h" />\r
     <ClInclude Include="..\..\openssl-1.0.1c\include\openssl\ossl_typ.h" />\r
     <ClInclude Include="..\..\openssl-1.0.1c\include\openssl\pem.h" />\r

diff --git a/libs/win32/openssl/libeay32.2012.vcxproj.filters b/libs/win32/openssl/libeay32.2012.vcxproj.filters
index 594e7558c4110ebdae5f9d3e127aa903ee1b60a8..0ec33e602d7df566ca4afed45938c8cbffc85b2f 100644 (file)
--- a/libs/win32/openssl/libeay32.2012.vcxproj.filters
+++ b/libs/win32/openssl/libeay32.2012.vcxproj.filters
@@ -2074,9 +2074,6 @@
     <ClInclude Include="..\..\openssl-1.0.1c\include\openssl\ocsp.h">\r
       <Filter>Header Files\openssl</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\..\openssl-1.0.1c\opensslconf.h">\r
-      <Filter>Header Files\openssl</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="..\..\openssl-1.0.1c\include\openssl\opensslv.h">\r
       <Filter>Header Files\openssl</Filter>\r
     </ClInclude>\r

diff --git a/libs/win32/pcre/libpcre.2012.vcxproj b/libs/win32/pcre/libpcre.2012.vcxproj
index ee5ea0fd5142446e9313fe15c4a70d3065d52d88..8724fd6ff208a94581e4ef75fa706ff14d258856 100644 (file)
--- a/libs/win32/pcre/libpcre.2012.vcxproj
+++ b/libs/win32/pcre/libpcre.2012.vcxproj
@@ -457,7 +457,6 @@
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="config.h" />\r
-    <ClInclude Include="..\..\pcre\internal.h" />\r
     <ClInclude Include="..\..\pcre\pcre.h" />\r
     <ClInclude Include="..\..\pcre\pcre_internal.h" />\r
     <ClInclude Include="..\..\pcre\pcreposix.h" />\r

diff --git a/libs/win32/pcre/libpcre.2012.vcxproj.filters b/libs/win32/pcre/libpcre.2012.vcxproj.filters
index 60add322d9282a4208ec9d9886b8abe6a1308121..338245192e86ad659574ee581964a8e1a63cc7ba 100644 (file)
--- a/libs/win32/pcre/libpcre.2012.vcxproj.filters
+++ b/libs/win32/pcre/libpcre.2012.vcxproj.filters
@@ -79,9 +79,6 @@
     <ClInclude Include="config.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\..\pcre\internal.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="..\..\pcre\pcre.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r

diff --git a/w32/Library/FreeSwitchCore.2012.vcxproj b/w32/Library/FreeSwitchCore.2012.vcxproj
index 1f282a9eec126ba6ef999aadbde4e156d80105a8..af0e500456ed92162209bbe340897ad35545b7fa 100644 (file)
--- a/w32/Library/FreeSwitchCore.2012.vcxproj
+++ b/w32/Library/FreeSwitchCore.2012.vcxproj
@@ -759,7 +759,6 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
     <ClInclude Include="..\..\src\include\switch_resample.h" />\r
     <ClInclude Include="..\..\src\include\switch_rtp.h" />\r
     <ClInclude Include="..\..\src\include\switch_scheduler.h" />\r
-    <ClInclude Include="..\..\src\include\switch_sqlite.h" />\r
     <ClInclude Include="..\..\src\include\switch_stun.h" />\r
     <ClInclude Include="..\..\src\include\switch_types.h" />\r
     <ClInclude Include="..\..\src\include\switch_utils.h" />\r

diff --git a/w32/Library/FreeSwitchCore.2012.vcxproj.filters b/w32/Library/FreeSwitchCore.2012.vcxproj.filters
index 883fd3d9191b083f855b0fe56db331c84a2c30a6..cfdeb39238841ccb566f0bcde1948dc40168b15f 100644 (file)
--- a/w32/Library/FreeSwitchCore.2012.vcxproj.filters
+++ b/w32/Library/FreeSwitchCore.2012.vcxproj.filters
@@ -318,9 +318,6 @@
     <ClInclude Include="..\..\src\include\switch_scheduler.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\..\src\include\switch_sqlite.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="..\..\src\include\switch_types.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r