From 1198931d489ab7835d98e307c07cdd17d0cf3b95 Mon Sep 17 00:00:00 2001 From: Michael Jerris <mike@jerris.com> Date: Fri, 22 Dec 2006 19:02:52 +0000 Subject: [PATCH] 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 --- libs/win32/apr-iconv/libapriconv.vcproj | 4 ++-- libs/win32/apr-util/libaprutil.vcproj | 4 ++-- src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.vcproj | 4 ++-- src/mod/xml_int/mod_xml_curl/mod_xml_curl.vcproj | 4 ++-- src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.vcproj | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/libs/win32/apr-iconv/libapriconv.vcproj b/libs/win32/apr-iconv/libapriconv.vcproj index 0efa975b0b..b7c37b39b3 100644 --- a/libs/win32/apr-iconv/libapriconv.vcproj +++ b/libs/win32/apr-iconv/libapriconv.vcproj @@ -48,7 +48,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\apr-iconv-1.1.1\include,..\..\apr-1.2.7\include" + AdditionalIncludeDirectories=""..\..\apr-iconv-1.1.1\include";..\..\apr\include" PreprocessorDefinitions="_DEBUG;API_DECLARE_EXPORT;WIN32;_WINDOWS" RuntimeLibrary="3" PrecompiledHeaderFile=".\Debug/libapriconv.pch" @@ -147,7 +147,7 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\apr-iconv-1.1.1\include,..\..\apr-1.2.7\include" + AdditionalIncludeDirectories=""..\..\apr-iconv-1.1.1\include";..\..\apr\include" PreprocessorDefinitions="NDEBUG;API_DECLARE_EXPORT;WIN32;_WINDOWS" StringPooling="true" RuntimeLibrary="2" diff --git a/libs/win32/apr-util/libaprutil.vcproj b/libs/win32/apr-util/libaprutil.vcproj index ad19f11143..c6252376e7 100644 --- a/libs/win32/apr-util/libaprutil.vcproj +++ b/libs/win32/apr-util/libaprutil.vcproj @@ -49,7 +49,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/EHsc " Optimization="0" - AdditionalIncludeDirectories="..\..\apr-util\include,..\..\apr-util\include/private,..\..\apr-util\dbm/sdbm,..\..\apr-iconv-1.1.1\include,..\..\apr-1.2.7\include" + AdditionalIncludeDirectories=""..\..\apr-util\include";"..\..\apr-util\include/private";"..\..\apr-util\dbm/sdbm";"..\..\apr-iconv-1.1.1\include";..\..\apr\include" PreprocessorDefinitions="_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS" RuntimeLibrary="3" PrecompiledHeaderFile=".\Debug/libaprutil.pch" @@ -149,7 +149,7 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\apr-util\include,..\..\apr-util\include/private,..\..\apr-util\dbm/sdbm,..\..\apr-iconv-1.1.1\include,..\..\apr-1.2.7\include" + AdditionalIncludeDirectories=""..\..\apr-util\include";"..\..\apr-util\include/private";"..\..\apr-util\dbm/sdbm";"..\..\apr-iconv-1.1.1\include";..\..\apr\include" PreprocessorDefinitions="NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS" StringPooling="true" RuntimeLibrary="2" 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 a7e39e8fb0..ce4ff32ff8 100644 --- 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 Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\iksemel-1.2\include"" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\iksemel\include"" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -126,7 +126,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\iksemel-1.2\include"" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\iksemel\include"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" RuntimeLibrary="2" UsePrecompiledHeader="0" 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 7131e48788..fc81c13cc2 100644 --- 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 Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\xmlcurl-c-1.03.14\include";"$(InputDir)..\..\..\..\libs\xmlcurl-c-1.03.14";"$(InputDir)..\..\..\..\libs\curl-7.15.2\include"" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c";"$(InputDir)..\..\..\..\libs\curl\include"" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;ABYSS_WIN32;CURL_STATICLIB" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -125,7 +125,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\xmlcurl-c-1.03.14\include";"$(InputDir)..\..\..\..\libs\xmlcurl-c-1.03.14";"$(InputDir)..\..\..\..\libs\curl-7.15.2\include"" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c";"$(InputDir)..\..\..\..\libs\curl\include"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;ABYSS_WIN32;CURL_STATICLIB" RuntimeLibrary="2" UsePrecompiledHeader="0" 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 f732ffe8d3..501d55c0e8 100644 --- 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 Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c-1.03.14\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c-1.03.14";"$(InputDir)..\..\..\..\libs\curl-7.15.2\include"" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c";"$(InputDir)..\..\..\..\libs\curl\include"" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;ABYSS_WIN32;CURL_STATICLIB" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -125,7 +125,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c-1.03.14\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c-1.03.14";"$(InputDir)..\..\..\..\libs\curl-7.15.2\include"" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c";"$(InputDir)..\..\..\..\libs\curl\include"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;ABYSS_WIN32;CURL_STATICLIB" RuntimeLibrary="2" UsePrecompiledHeader="0"