fix windows build paths from moving libs in tree.

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@3798 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/libs/win32/apr-iconv/libapriconv.vcproj b/libs/win32/apr-iconv/libapriconv.vcproj
index 0efa975b0b2a463a2be88aec28486ae54201b360..b7c37b39b37459f843e89b84e7a25cda4cd03d0e 100644 (file)
--- a/libs/win32/apr-iconv/libapriconv.vcproj
+++ b/libs/win32/apr-iconv/libapriconv.vcproj
@@ -48,7 +48,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\apr-iconv-1.1.1\include,..\..\apr-1.2.7\include"\r
+                               AdditionalIncludeDirectories="&quot;..\..\apr-iconv-1.1.1\include&quot;;..\..\apr\include"\r
                                PreprocessorDefinitions="_DEBUG;API_DECLARE_EXPORT;WIN32;_WINDOWS"\r
                                RuntimeLibrary="3"\r
                                PrecompiledHeaderFile=".\Debug/libapriconv.pch"\r
@@ -147,7 +147,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories="..\..\apr-iconv-1.1.1\include,..\..\apr-1.2.7\include"\r
+                               AdditionalIncludeDirectories="&quot;..\..\apr-iconv-1.1.1\include&quot;;..\..\apr\include"\r
                                PreprocessorDefinitions="NDEBUG;API_DECLARE_EXPORT;WIN32;_WINDOWS"\r
                                StringPooling="true"\r
                                RuntimeLibrary="2"\r

diff --git a/libs/win32/apr-util/libaprutil.vcproj b/libs/win32/apr-util/libaprutil.vcproj
index ad19f111437cca34b4843d6f2b6a97062669ff62..c6252376e718266fba4055f3a2a008f5676700b6 100644 (file)
--- a/libs/win32/apr-util/libaprutil.vcproj
+++ b/libs/win32/apr-util/libaprutil.vcproj
@@ -49,7 +49,7 @@
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/EHsc "\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\apr-util\include,..\..\apr-util\include/private,..\..\apr-util\dbm/sdbm,..\..\apr-iconv-1.1.1\include,..\..\apr-1.2.7\include"\r
+                               AdditionalIncludeDirectories=""..\..\apr-util\include";"..\..\apr-util\include/private";"..\..\apr-util\dbm/sdbm";"..\..\apr-iconv-1.1.1\include";..\..\apr\include"\r
                                PreprocessorDefinitions="_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS"\r
                                RuntimeLibrary="3"\r
                                PrecompiledHeaderFile=".\Debug/libaprutil.pch"\r
@@ -149,7 +149,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories="..\..\apr-util\include,..\..\apr-util\include/private,..\..\apr-util\dbm/sdbm,..\..\apr-iconv-1.1.1\include,..\..\apr-1.2.7\include"\r
+                               AdditionalIncludeDirectories=""..\..\apr-util\include";"..\..\apr-util\include/private";"..\..\apr-util\dbm/sdbm";"..\..\apr-iconv-1.1.1\include";..\..\apr\include"\r
                                PreprocessorDefinitions="NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS"\r
                                StringPooling="true"\r
                                RuntimeLibrary="2"\r

diff --git a/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.vcproj b/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.vcproj
index a7e39e8fb0634c760d9c2aed93192d07fa958f5e..ce4ff32ff8c4cf002356f94b5305a8e826d1a033 100644 (file)
--- a/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.vcproj
+++ b/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.vcproj
@@ -42,7 +42,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\include&quot;;&quot;$(InputDir)..\..\..\..\libs\include&quot;;&quot;$(InputDir)..\..\..\..\libs\iksemel-1.2\include&quot;"\r
+                               AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\include&quot;;&quot;$(InputDir)..\..\..\..\libs\include&quot;;&quot;$(InputDir)..\..\..\..\libs\iksemel\include&quot;"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -126,7 +126,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\include&quot;;&quot;$(InputDir)..\..\..\..\libs\include&quot;;&quot;$(InputDir)..\..\..\..\libs\iksemel-1.2\include&quot;"\r
+                               AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\include&quot;;&quot;$(InputDir)..\..\..\..\libs\include&quot;;&quot;$(InputDir)..\..\..\..\libs\iksemel\include&quot;"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r

diff --git a/src/mod/xml_int/mod_xml_curl/mod_xml_curl.vcproj b/src/mod/xml_int/mod_xml_curl/mod_xml_curl.vcproj
index 7131e48788bd570f2d7cf911c5a71313641b3a8a..fc81c13cc201a076df357b2cf445d5d4e2e90b28 100644 (file)
--- a/src/mod/xml_int/mod_xml_curl/mod_xml_curl.vcproj
+++ b/src/mod/xml_int/mod_xml_curl/mod_xml_curl.vcproj
@@ -42,7 +42,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\include&quot;;&quot;$(InputDir)include&quot;;&quot;$(InputDir)..\..\..\..\libs\include&quot;;&quot;$(InputDir)..\..\..\..\libs\xmlcurl-c-1.03.14\include&quot;;&quot;$(InputDir)..\..\..\..\libs\xmlcurl-c-1.03.14&quot;;&quot;$(InputDir)..\..\..\..\libs\curl-7.15.2\include&quot;"\r
+                               AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\include&quot;;&quot;$(InputDir)include&quot;;&quot;$(InputDir)..\..\..\..\libs\include&quot;;&quot;$(InputDir)..\..\..\..\libs\xmlrpc-c\include&quot;;&quot;$(InputDir)..\..\..\..\libs\xmlrpc-c&quot;;&quot;$(InputDir)..\..\..\..\libs\curl\include&quot;"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;ABYSS_WIN32;CURL_STATICLIB"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -125,7 +125,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\include&quot;;&quot;$(InputDir)include&quot;;&quot;$(InputDir)..\..\..\..\libs\include&quot;;&quot;$(InputDir)..\..\..\..\libs\xmlcurl-c-1.03.14\include&quot;;&quot;$(InputDir)..\..\..\..\libs\xmlcurl-c-1.03.14&quot;;&quot;$(InputDir)..\..\..\..\libs\curl-7.15.2\include&quot;"\r
+                               AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\include&quot;;&quot;$(InputDir)include&quot;;&quot;$(InputDir)..\..\..\..\libs\include&quot;;&quot;$(InputDir)..\..\..\..\libs\xmlrpc-c\include&quot;;&quot;$(InputDir)..\..\..\..\libs\xmlrpc-c&quot;;&quot;$(InputDir)..\..\..\..\libs\curl\include&quot;"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;ABYSS_WIN32;CURL_STATICLIB"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r

diff --git a/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.vcproj b/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.vcproj
index f732ffe8d3224439e3f7e842208fb4803fc2ac5a..501d55c0e8e8f0f2d8137250f9e469abd7057cc8 100644 (file)
--- a/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.vcproj
+++ b/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.vcproj
@@ -42,7 +42,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\include&quot;;&quot;$(InputDir)include&quot;;&quot;$(InputDir)..\..\..\..\libs\include&quot;;&quot;$(InputDir)..\..\..\..\libs\xmlrpc-c-1.03.14\include&quot;;&quot;$(InputDir)..\..\..\..\libs\xmlrpc-c-1.03.14&quot;;&quot;$(InputDir)..\..\..\..\libs\curl-7.15.2\include&quot;"\r
+                               AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\include&quot;;&quot;$(InputDir)include&quot;;&quot;$(InputDir)..\..\..\..\libs\include&quot;;&quot;$(InputDir)..\..\..\..\libs\xmlrpc-c\include&quot;;&quot;$(InputDir)..\..\..\..\libs\xmlrpc-c&quot;;&quot;$(InputDir)..\..\..\..\libs\curl\include&quot;"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;ABYSS_WIN32;CURL_STATICLIB"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -125,7 +125,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\include&quot;;&quot;$(InputDir)include&quot;;&quot;$(InputDir)..\..\..\..\libs\include&quot;;&quot;$(InputDir)..\..\..\..\libs\xmlrpc-c-1.03.14\include&quot;;&quot;$(InputDir)..\..\..\..\libs\xmlrpc-c-1.03.14&quot;;&quot;$(InputDir)..\..\..\..\libs\curl-7.15.2\include&quot;"\r
+                               AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\include&quot;;&quot;$(InputDir)include&quot;;&quot;$(InputDir)..\..\..\..\libs\include&quot;;&quot;$(InputDir)..\..\..\..\libs\xmlrpc-c\include&quot;;&quot;$(InputDir)..\..\..\..\libs\xmlrpc-c&quot;;&quot;$(InputDir)..\..\..\..\libs\curl\include&quot;"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;ABYSS_WIN32;CURL_STATICLIB"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r