Intermediate build folder for the xml library was hard coded to same location for...

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

diff --git a/libs/win32/apr-util/xml.2008.vcproj b/libs/win32/apr-util/xml.2008.vcproj
index 7822b242a89d93b862541d40e272a0a7997a7875..82f5ff06e35663ce2c0b4e62a294bcec1a1977bf 100644 (file)
--- a/libs/win32/apr-util/xml.2008.vcproj
+++ b/libs/win32/apr-util/xml.2008.vcproj
@@ -26,6 +26,7 @@
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="2"\r
+                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -51,10 +52,10 @@
                                StringPooling="true"\r
                                RuntimeLibrary="2"\r
                                EnableFunctionLevelLinking="true"\r
-                               PrecompiledHeaderFile=".\LibR/xml.pch"\r
-                               AssemblerListingLocation=".\LibR/"\r
-                               ObjectFile=".\LibR/"\r
-                               ProgramDataBaseFileName="LibR\xml_src"\r
+                               PrecompiledHeaderFile="$(IntDir)/xml.pch"\r
+                               AssemblerListingLocation="$(IntDir)\"\r
+                               ObjectFile="$(IntDir)\"\r
+                               ProgramDataBaseFileName="$(IntDir)\xml_src"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
@@ -83,7 +84,7 @@
                        <Tool\r
                                Name="VCBscMakeTool"\r
                                SuppressStartupBanner="true"\r
-                               OutputFile=".\LibR/xml.bsc"\r
+                               OutputFile="$(IntDir)\xml.bsc"\r
                        />\r
                        <Tool\r
                                Name="VCFxCopTool"\r
@@ -93,13 +94,14 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Debug|Win32"\r
-                       OutputDirectory="$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)"\r
+                       Name="Release|x64"\r
+                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="2"\r
+                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -115,18 +117,21 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalOptions="/EHsc "\r
-                               Optimization="0"\r
+                               Optimization="2"\r
+                               InlineFunctionExpansion="1"\r
                                AdditionalIncludeDirectories="$(ProjectDir)..\..\apr-util\xml\expat\lib\"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;VERSION=\&quot;expat_1.95.2\&quot;"\r
-                               RuntimeLibrary="3"\r
-                               PrecompiledHeaderFile=".\LibD/xml.pch"\r
-                               AssemblerListingLocation=".\LibD/"\r
-                               ObjectFile=".\LibD/"\r
-                               ProgramDataBaseFileName="LibD\xml_src"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;VERSION=\&quot;expat_1.95.2\&quot;"\r
+                               StringPooling="true"\r
+                               RuntimeLibrary="2"\r
+                               EnableFunctionLevelLinking="true"\r
+                               PrecompiledHeaderFile="$(IntDir)\xml.pch"\r
+                               AssemblerListingLocation="$(IntDir)\"\r
+                               ObjectFile="$(IntDir)\"\r
+                               ProgramDataBaseFileName="$(IntDir)\vc90.pdb"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
@@ -155,7 +160,7 @@
                        <Tool\r
                                Name="VCBscMakeTool"\r
                                SuppressStartupBanner="true"\r
-                               OutputFile=".\LibD/xml.bsc"\r
+                               OutputFile="$(IntDir)\xml.bsc"\r
                        />\r
                        <Tool\r
                                Name="VCFxCopTool"\r
@@ -165,9 +170,9 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release|x64"\r
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -187,21 +192,18 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
+                               AdditionalOptions="/EHsc "\r
+                               Optimization="0"\r
                                AdditionalIncludeDirectories="$(ProjectDir)..\..\apr-util\xml\expat\lib\"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;VERSION=\&quot;expat_1.95.2\&quot;"\r
-                               StringPooling="true"\r
-                               RuntimeLibrary="2"\r
-                               EnableFunctionLevelLinking="true"\r
-                               PrecompiledHeaderFile=".\LibR/xml.pch"\r
-                               AssemblerListingLocation=".\LibR/"\r
-                               ObjectFile=".\LibR/"\r
-                               ProgramDataBaseFileName="LibR\xml_src"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;VERSION=\&quot;expat_1.95.2\&quot;"\r
+                               RuntimeLibrary="3"\r
+                               PrecompiledHeaderFile="$(IntDir)\xml.pch"\r
+                               AssemblerListingLocation="$(IntDir)\"\r
+                               ObjectFile="$(IntDir)\"\r
+                               ProgramDataBaseFileName="LibD\xml_src"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
@@ -230,7 +232,7 @@
                        <Tool\r
                                Name="VCBscMakeTool"\r
                                SuppressStartupBanner="true"\r
-                               OutputFile=".\LibR/xml.bsc"\r
+                               OutputFile="$(IntDir)\xml.bsc"\r
                        />\r
                        <Tool\r
                                Name="VCFxCopTool"\r
@@ -271,9 +273,9 @@
                                AdditionalIncludeDirectories="$(ProjectDir)..\..\apr-util\xml\expat\lib\"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;VERSION=\&quot;expat_1.95.2\&quot;"\r
                                RuntimeLibrary="3"\r
-                               PrecompiledHeaderFile=".\LibD/xml.pch"\r
-                               AssemblerListingLocation=".\LibD/"\r
-                               ObjectFile=".\LibD/"\r
+                               PrecompiledHeaderFile="$(IntDir)\xml.pch"\r
+                               AssemblerListingLocation="$(IntDir)\"\r
+                               ObjectFile="$(IntDir)\"\r
                                ProgramDataBaseFileName="LibD\xml_src"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
@@ -303,7 +305,7 @@
                        <Tool\r
                                Name="VCBscMakeTool"\r
                                SuppressStartupBanner="true"\r
-                               OutputFile=".\LibD/xml.bsc"\r
+                               OutputFile="$(IntDir)\xml.bsc"\r
                        />\r
                        <Tool\r
                                Name="VCFxCopTool"\r
@@ -333,7 +335,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="Release|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
@@ -342,7 +344,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|x64"\r
+                                       Name="Debug|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
@@ -373,7 +375,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="Release|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
@@ -382,7 +384,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|x64"\r
+                                       Name="Debug|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
@@ -413,7 +415,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="Release|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
@@ -422,7 +424,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|x64"\r
+                                       Name="Debug|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
@@ -454,7 +456,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="Release|x64"\r
                                        ExcludedFromBuild="true"\r
                                        >\r
                                        <Tool\r
@@ -464,7 +466,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|x64"\r
+                                       Name="Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                        >\r
                                        <Tool\r
@@ -498,7 +500,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="Release|x64"\r
                                        ExcludedFromBuild="true"\r
                                        >\r
                                        <Tool\r
@@ -508,7 +510,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|x64"\r
+                                       Name="Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                        >\r
                                        <Tool\r
@@ -595,7 +597,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="Release|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
@@ -605,7 +607,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|x64"\r
+                                       Name="Debug|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
@@ -639,7 +641,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="Release|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
@@ -649,7 +651,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|x64"\r
+                                       Name="Debug|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r