Skip to content

F
freeswitch
提交 59a4fea6 authored 作者: Carlos J. Talbot's avatar Carlos J. Talbot
浏览文件
操作

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

Intermediate build folder for the xml library was hard coded to same location for 32 & 64 bit builds, causing VS 2008 to complain during linking. Switched to the use of $(IntDir)

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@16406 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 8a757e7c
隐藏空白字符变更
内嵌 并排
正在显示 包含 52 行增加 和 50 行删除
libs/win32/apr-util/xml.2008.vcproj
浏览文件 @ 59a4fea6
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
UseOfMFC="0" UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false" ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2" CharacterSet="2"
WholeProgramOptimization="1"
> >
<Tool <Tool
Name="VCPreBuildEventTool" Name="VCPreBuildEventTool"
...@@ -51,10 +52,10 @@ ...@@ -51,10 +52,10 @@
StringPooling="true" StringPooling="true"
RuntimeLibrary="2" RuntimeLibrary="2"
EnableFunctionLevelLinking="true" EnableFunctionLevelLinking="true"
PrecompiledHeaderFile=".\LibR/xml.pch" PrecompiledHeaderFile="$(IntDir)/xml.pch"
AssemblerListingLocation=".\LibR/" AssemblerListingLocation="$(IntDir)\"
ObjectFile=".\LibR/" ObjectFile="$(IntDir)\"
ProgramDataBaseFileName="LibR\xml_src" ProgramDataBaseFileName="$(IntDir)\xml_src"
WarningLevel="3" WarningLevel="3"
SuppressStartupBanner="true" SuppressStartupBanner="true"
DebugInformationFormat="3" DebugInformationFormat="3"
...@@ -83,7 +84,7 @@ ...@@ -83,7 +84,7 @@
<Tool <Tool
Name="VCBscMakeTool" Name="VCBscMakeTool"
SuppressStartupBanner="true" SuppressStartupBanner="true"
OutputFile=".\LibR/xml.bsc" OutputFile="$(IntDir)\xml.bsc"
/> />
<Tool <Tool
Name="VCFxCopTool" Name="VCFxCopTool"
...@@ -93,13 +94,14 @@ ...@@ -93,13 +94,14 @@
/> />
</Configuration> </Configuration>
<Configuration <Configuration
Name="Debug|Win32" Name="Release|x64"
OutputDirectory="$(ConfigurationName)" OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4" ConfigurationType="4"
UseOfMFC="0" UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false" ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2" CharacterSet="2"
WholeProgramOptimization="1"
> >
<Tool <Tool
Name="VCPreBuildEventTool" Name="VCPreBuildEventTool"
...@@ -115,18 +117,21 @@ ...@@ -115,18 +117,21 @@
/> />
<Tool <Tool
Name="VCMIDLTool" Name="VCMIDLTool"
TargetEnvironment="3"
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions="/EHsc " Optimization="2"
Optimization="0" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="$(ProjectDir)..\..\apr-util\xml\expat\lib\" AdditionalIncludeDirectories="$(ProjectDir)..\..\apr-util\xml\expat\lib\"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;VERSION=\&quot;expat_1.95.2\&quot;" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;VERSION=\&quot;expat_1.95.2\&quot;"
RuntimeLibrary="3" StringPooling="true"
PrecompiledHeaderFile=".\LibD/xml.pch" RuntimeLibrary="2"
AssemblerListingLocation=".\LibD/" EnableFunctionLevelLinking="true"
ObjectFile=".\LibD/" PrecompiledHeaderFile="$(IntDir)\xml.pch"
ProgramDataBaseFileName="LibD\xml_src" AssemblerListingLocation="$(IntDir)\"
ObjectFile="$(IntDir)\"
ProgramDataBaseFileName="$(IntDir)\vc90.pdb"
WarningLevel="3" WarningLevel="3"
SuppressStartupBanner="true" SuppressStartupBanner="true"
DebugInformationFormat="3" DebugInformationFormat="3"
...@@ -155,7 +160,7 @@ ...@@ -155,7 +160,7 @@
<Tool <Tool
Name="VCBscMakeTool" Name="VCBscMakeTool"
SuppressStartupBanner="true" SuppressStartupBanner="true"
OutputFile=".\LibD/xml.bsc" OutputFile="$(IntDir)\xml.bsc"
/> />
<Tool <Tool
Name="VCFxCopTool" Name="VCFxCopTool"
...@@ -165,9 +170,9 @@ ...@@ -165,9 +170,9 @@
/> />
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|x64" Name="Debug|Win32"
OutputDirectory="$(PlatformName)\$(ConfigurationName)" OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="4" ConfigurationType="4"
UseOfMFC="0" UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false" ATLMinimizesCRunTimeLibraryUsage="false"
...@@ -187,21 +192,18 @@ ...@@ -187,21 +192,18 @@
/> />
<Tool <Tool
Name="VCMIDLTool" Name="VCMIDLTool"
TargetEnvironment="3"
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="2" AdditionalOptions="/EHsc "
InlineFunctionExpansion="1" Optimization="0"
AdditionalIncludeDirectories="$(ProjectDir)..\..\apr-util\xml\expat\lib\" AdditionalIncludeDirectories="$(ProjectDir)..\..\apr-util\xml\expat\lib\"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;VERSION=\&quot;expat_1.95.2\&quot;" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;VERSION=\&quot;expat_1.95.2\&quot;"
StringPooling="true" RuntimeLibrary="3"
RuntimeLibrary="2" PrecompiledHeaderFile="$(IntDir)\xml.pch"
EnableFunctionLevelLinking="true" AssemblerListingLocation="$(IntDir)\"
PrecompiledHeaderFile=".\LibR/xml.pch" ObjectFile="$(IntDir)\"
AssemblerListingLocation=".\LibR/" ProgramDataBaseFileName="LibD\xml_src"
ObjectFile=".\LibR/"
ProgramDataBaseFileName="LibR\xml_src"
WarningLevel="3" WarningLevel="3"
SuppressStartupBanner="true" SuppressStartupBanner="true"
DebugInformationFormat="3" DebugInformationFormat="3"
...@@ -230,7 +232,7 @@ ...@@ -230,7 +232,7 @@
<Tool <Tool
Name="VCBscMakeTool" Name="VCBscMakeTool"
SuppressStartupBanner="true" SuppressStartupBanner="true"
OutputFile=".\LibR/xml.bsc" OutputFile="$(IntDir)\xml.bsc"
/> />
<Tool <Tool
Name="VCFxCopTool" Name="VCFxCopTool"
...@@ -271,9 +273,9 @@ ...@@ -271,9 +273,9 @@
AdditionalIncludeDirectories="$(ProjectDir)..\..\apr-util\xml\expat\lib\" AdditionalIncludeDirectories="$(ProjectDir)..\..\apr-util\xml\expat\lib\"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;VERSION=\&quot;expat_1.95.2\&quot;" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;VERSION=\&quot;expat_1.95.2\&quot;"
RuntimeLibrary="3" RuntimeLibrary="3"
PrecompiledHeaderFile=".\LibD/xml.pch" PrecompiledHeaderFile="$(IntDir)\xml.pch"
AssemblerListingLocation=".\LibD/" AssemblerListingLocation="$(IntDir)\"
ObjectFile=".\LibD/" ObjectFile="$(IntDir)\"
ProgramDataBaseFileName="LibD\xml_src" ProgramDataBaseFileName="LibD\xml_src"
WarningLevel="3" WarningLevel="3"
SuppressStartupBanner="true" SuppressStartupBanner="true"
...@@ -303,7 +305,7 @@ ...@@ -303,7 +305,7 @@
<Tool <Tool
Name="VCBscMakeTool" Name="VCBscMakeTool"
SuppressStartupBanner="true" SuppressStartupBanner="true"
OutputFile=".\LibD/xml.bsc" OutputFile="$(IntDir)\xml.bsc"
/> />
<Tool <Tool
Name="VCFxCopTool" Name="VCFxCopTool"
...@@ -333,7 +335,7 @@ ...@@ -333,7 +335,7 @@
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Debug|Win32" Name="Release|x64"
> >
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
...@@ -342,7 +344,7 @@ ...@@ -342,7 +344,7 @@
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Release|x64" Name="Debug|Win32"
> >
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
...@@ -373,7 +375,7 @@ ...@@ -373,7 +375,7 @@
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Debug|Win32" Name="Release|x64"
> >
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
...@@ -382,7 +384,7 @@ ...@@ -382,7 +384,7 @@
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Release|x64" Name="Debug|Win32"
> >
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
...@@ -413,7 +415,7 @@ ...@@ -413,7 +415,7 @@
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Debug|Win32" Name="Release|x64"
> >
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
...@@ -422,7 +424,7 @@ ...@@ -422,7 +424,7 @@
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Release|x64" Name="Debug|Win32"
> >
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
...@@ -454,7 +456,7 @@ ...@@ -454,7 +456,7 @@
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Debug|Win32" Name="Release|x64"
ExcludedFromBuild="true" ExcludedFromBuild="true"
> >
<Tool <Tool
...@@ -464,7 +466,7 @@ ...@@ -464,7 +466,7 @@
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Release|x64" Name="Debug|Win32"
ExcludedFromBuild="true" ExcludedFromBuild="true"
> >
<Tool <Tool
...@@ -498,7 +500,7 @@ ...@@ -498,7 +500,7 @@
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Debug|Win32" Name="Release|x64"
ExcludedFromBuild="true" ExcludedFromBuild="true"
> >
<Tool <Tool
...@@ -508,7 +510,7 @@ ...@@ -508,7 +510,7 @@
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Release|x64" Name="Debug|Win32"
ExcludedFromBuild="true" ExcludedFromBuild="true"
> >
<Tool <Tool
...@@ -595,7 +597,7 @@ ...@@ -595,7 +597,7 @@
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Debug|Win32" Name="Release|x64"
> >
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
...@@ -605,7 +607,7 @@ ...@@ -605,7 +607,7 @@
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Release|x64" Name="Debug|Win32"
> >
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
...@@ -639,7 +641,7 @@ ...@@ -639,7 +641,7 @@
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Debug|Win32" Name="Release|x64"
> >
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
...@@ -649,7 +651,7 @@ ...@@ -649,7 +651,7 @@
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Release|x64" Name="Debug|Win32"
> >
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论