|
From: <ki...@us...> - 2010-10-24 18:45:51
|
Revision: 7350
http://winmerge.svn.sourceforge.net/winmerge/?rev=7350&view=rev
Author: kimmov
Date: 2010-10-24 18:45:42 +0000 (Sun, 24 Oct 2010)
Log Message:
-----------
Upgrade VS solution / project files to VS 2005 versions.
Modified Paths:
--------------
branches/R2_14/Externals/expat/examples/elements.vcproj
branches/R2_14/Externals/expat/examples/outline.vcproj
branches/R2_14/Externals/expat/expat.sln
branches/R2_14/Externals/expat/lib/expat.vcproj
branches/R2_14/Externals/expat/lib/expat_static.vcproj
branches/R2_14/Externals/expat/lib/expatw.vcproj
branches/R2_14/Externals/expat/lib/expatw_static.vcproj
branches/R2_14/Externals/expat/xmlwf/xmlwf.vcproj
branches/R2_14/Externals/pcre/Win32/PCRE.sln
branches/R2_14/Externals/pcre/Win32/pcre.vcproj
branches/R2_14/Externals/scew/win32/scew.vcproj
branches/R2_14/ShellExtension/ShellExtension.vcproj
branches/R2_14/Src/Merge.vcproj
branches/R2_14/WinMerge.sln
Modified: branches/R2_14/Externals/expat/examples/elements.vcproj
===================================================================
--- branches/R2_14/Externals/expat/examples/elements.vcproj 2010-10-24 11:59:07 UTC (rev 7349)
+++ branches/R2_14/Externals/expat/examples/elements.vcproj 2010-10-24 18:45:42 UTC (rev 7350)
@@ -1,24 +1,46 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="7.10"
+ Version="8.00"
Name="elements"
- SccProjectName=""
- SccLocalPath="">
+ ProjectGUID="{4C943AC7-0187-4AB9-A9DB-F1BE96E2E099}"
+ >
<Platforms>
<Platform
- Name="Win32"/>
+ Name="Win32"
+ />
</Platforms>
+ <ToolFiles>
+ </ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory=".\../../../Build/expat/elements/Debug"
IntermediateDirectory=".\../../../BuildTmp/expat/elements/Debug"
ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
<Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\../../../Build/expat/elements/Debug/elements.tlb"
+ HeaderFileName=""
+ />
+ <Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\lib"
@@ -31,105 +53,146 @@
ProgramDataBaseFileName=".\../../../BuildTmp/expat/elements/Debug/"
BrowseInformation="1"
WarningLevel="3"
- SuppressStartupBanner="TRUE"
+ SuppressStartupBanner="true"
DebugInformationFormat="4"
- CompileAs="0"/>
+ CompileAs="0"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
Name="VCLinkerTool"
AdditionalDependencies="odbccp32.lib libexpatMT.lib odbc32.lib"
OutputFile=".\../../../Build/expat/elements/Debug/elements.exe"
LinkIncremental="2"
- SuppressStartupBanner="TRUE"
+ SuppressStartupBanner="true"
AdditionalLibraryDirectories="../../../Build/expat/lib/Debug_static"
- GenerateDebugInformation="TRUE"
+ GenerateDebugInformation="true"
SubSystem="1"
- TargetMachine="1"/>
+ TargetMachine="1"
+ />
<Tool
- Name="VCMIDLTool"
- TypeLibraryName=".\../../../Build/expat/elements/Debug/elements.tlb"
- HeaderFileName=""/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManifestTool"
+ />
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCAppVerifierTool"
+ />
<Tool
- Name="VCXMLDataGeneratorTool"/>
+ Name="VCWebDeploymentTool"
+ />
<Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory=".\../../../Build/expat/elements/Release"
IntermediateDirectory=".\../../../BuildTmp/expat/elements/Release"
ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
<Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\../../../Build/expat/elements/Release/elements.tlb"
+ HeaderFileName=""
+ />
+ <Tool
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\lib"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;XML_STATIC"
- StringPooling="TRUE"
+ StringPooling="true"
RuntimeLibrary="0"
- EnableFunctionLevelLinking="TRUE"
+ EnableFunctionLevelLinking="true"
PrecompiledHeaderFile=".\../../../BuildTmp/expat/elements/Release/elements.pch"
AssemblerListingLocation=".\../../../BuildTmp/expat/elements/Release/"
ObjectFile=".\../../../BuildTmp/expat/elements/Release/"
ProgramDataBaseFileName=".\../../../BuildTmp/expat/elements/Release/"
WarningLevel="3"
- SuppressStartupBanner="TRUE"
- CompileAs="0"/>
+ SuppressStartupBanner="true"
+ CompileAs="0"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
Name="VCLinkerTool"
AdditionalDependencies="odbccp32.lib libexpatMT.lib odbc32.lib"
OutputFile=".\../../../Build/expat/elements/Release/elements.exe"
LinkIncremental="1"
- SuppressStartupBanner="TRUE"
+ SuppressStartupBanner="true"
AdditionalLibraryDirectories="../../../Build/expat/lib/Release_static"
SubSystem="1"
- TargetMachine="1"/>
+ TargetMachine="1"
+ />
<Tool
- Name="VCMIDLTool"
- TypeLibraryName=".\../../../Build/expat/elements/Release/elements.tlb"
- HeaderFileName=""/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManifestTool"
+ />
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCAppVerifierTool"
+ />
<Tool
- Name="VCXMLDataGeneratorTool"/>
+ Name="VCWebDeploymentTool"
+ />
<Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
</Configurations>
<References>
@@ -137,36 +200,44 @@
<Files>
<Filter
Name="Source Files"
- Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
<File
- RelativePath="elements.c">
+ RelativePath="elements.c"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
+ PreprocessorDefinitions=""
+ />
</FileConfiguration>
</File>
</Filter>
<Filter
Name="Header Files"
- Filter="h;hpp;hxx;hm;inl">
+ Filter="h;hpp;hxx;hm;inl"
+ >
</Filter>
<Filter
Name="Resource Files"
- Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+ >
</Filter>
</Files>
<Globals>
Modified: branches/R2_14/Externals/expat/examples/outline.vcproj
===================================================================
--- branches/R2_14/Externals/expat/examples/outline.vcproj 2010-10-24 11:59:07 UTC (rev 7349)
+++ branches/R2_14/Externals/expat/examples/outline.vcproj 2010-10-24 18:45:42 UTC (rev 7350)
@@ -1,24 +1,46 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="7.10"
+ Version="8.00"
Name="outline"
- SccProjectName=""
- SccLocalPath="">
+ ProjectGUID="{FD603999-011A-458C-9677-D596E25A620C}"
+ >
<Platforms>
<Platform
- Name="Win32"/>
+ Name="Win32"
+ />
</Platforms>
+ <ToolFiles>
+ </ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory=".\../../../Build/expat/outline/Debug"
IntermediateDirectory=".\../../../BuildTmp/expat/outline/Debug"
ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
<Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\../../../Build/expat/outline/Debug/outline.tlb"
+ HeaderFileName=""
+ />
+ <Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\lib"
@@ -30,101 +52,142 @@
ObjectFile=".\../../../BuildTmp/expat/outline/Debug/"
ProgramDataBaseFileName=".\../../../BuildTmp/expat/outline/Debug/"
WarningLevel="3"
- SuppressStartupBanner="TRUE"
+ SuppressStartupBanner="true"
DebugInformationFormat="4"
- CompileAs="0"/>
+ CompileAs="0"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
Name="VCLinkerTool"
OutputFile=".\../../../Build/expat/outline/Debug/outline.exe"
LinkIncremental="2"
- SuppressStartupBanner="TRUE"
- GenerateDebugInformation="TRUE"
+ SuppressStartupBanner="true"
+ GenerateDebugInformation="true"
SubSystem="1"
- TargetMachine="1"/>
+ TargetMachine="1"
+ />
<Tool
- Name="VCMIDLTool"
- TypeLibraryName=".\../../../Build/expat/outline/Debug/outline.tlb"
- HeaderFileName=""/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManifestTool"
+ />
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCAppVerifierTool"
+ />
<Tool
- Name="VCXMLDataGeneratorTool"/>
+ Name="VCWebDeploymentTool"
+ />
<Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory=".\../../../Build/expat/outline/Release"
IntermediateDirectory=".\../../../BuildTmp/expat/outline/Release"
ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
<Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\../../../Build/expat/outline/Release/outline.tlb"
+ HeaderFileName=""
+ />
+ <Tool
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\lib"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- StringPooling="TRUE"
+ StringPooling="true"
RuntimeLibrary="0"
- EnableFunctionLevelLinking="TRUE"
+ EnableFunctionLevelLinking="true"
PrecompiledHeaderFile=".\../../../BuildTmp/expat/outline/Release/outline.pch"
AssemblerListingLocation=".\../../../BuildTmp/expat/outline/Release/"
ObjectFile=".\../../../BuildTmp/expat/outline/Release/"
ProgramDataBaseFileName=".\../../../BuildTmp/expat/outline/Release/"
WarningLevel="3"
- SuppressStartupBanner="TRUE"
- CompileAs="0"/>
+ SuppressStartupBanner="true"
+ CompileAs="0"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
Name="VCLinkerTool"
OutputFile=".\../../../Build/expat/outline/Release/outline.exe"
LinkIncremental="1"
- SuppressStartupBanner="TRUE"
+ SuppressStartupBanner="true"
SubSystem="1"
- TargetMachine="1"/>
+ TargetMachine="1"
+ />
<Tool
- Name="VCMIDLTool"
- TypeLibraryName=".\../../../Build/expat/outline/Release/outline.tlb"
- HeaderFileName=""/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManifestTool"
+ />
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCAppVerifierTool"
+ />
<Tool
- Name="VCXMLDataGeneratorTool"/>
+ Name="VCWebDeploymentTool"
+ />
<Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
</Configurations>
<References>
@@ -132,35 +195,43 @@
<Files>
<Filter
Name="Source Files"
- Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
<File
- RelativePath="outline.c">
+ RelativePath="outline.c"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
- BasicRuntimeChecks="3"/>
+ BasicRuntimeChecks="3"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
+ PreprocessorDefinitions=""
+ />
</FileConfiguration>
</File>
</Filter>
<Filter
Name="Header Files"
- Filter="h;hpp;hxx;hm;inl">
+ Filter="h;hpp;hxx;hm;inl"
+ >
</Filter>
<Filter
Name="Resource Files"
- Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+ >
</Filter>
</Files>
<Globals>
Modified: branches/R2_14/Externals/expat/expat.sln
===================================================================
--- branches/R2_14/Externals/expat/expat.sln 2010-10-24 11:59:07 UTC (rev 7349)
+++ branches/R2_14/Externals/expat/expat.sln 2010-10-24 18:45:42 UTC (rev 7350)
@@ -1,24 +1,17 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "elements", "examples\elements.vcproj", "{4C943AC7-0187-4AB9-A9DB-F1BE96E2E099}"
ProjectSection(ProjectDependencies) = postProject
{464DBF5A-69E8-4E1A-8401-171371B86299} = {464DBF5A-69E8-4E1A-8401-171371B86299}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "expat", "lib\expat.vcproj", "{ACAE29AF-D15F-402E-AE0A-93141CF439C6}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "expat_static", "lib\expat_static.vcproj", "{464DBF5A-69E8-4E1A-8401-171371B86299}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "expatw", "lib\expatw.vcproj", "{AC9279F5-5C6F-477F-AA3B-A42F8859D236}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "expatw_static", "lib\expatw_static.vcproj", "{4815F7F0-BA32-4D79-A041-A146B0130D9E}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "outline", "examples\outline.vcproj", "{FD603999-011A-458C-9677-D596E25A620C}"
ProjectSection(ProjectDependencies) = postProject
@@ -31,44 +24,41 @@
EndProjectSection
EndProject
Global
- GlobalSection(SolutionConfiguration) = preSolution
- Debug = Debug
- Release = Release
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Win32 = Debug|Win32
+ Release|Win32 = Release|Win32
EndGlobalSection
- GlobalSection(ProjectDependencies) = postSolution
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {4C943AC7-0187-4AB9-A9DB-F1BE96E2E099}.Debug|Win32.ActiveCfg = Debug|Win32
+ {4C943AC7-0187-4AB9-A9DB-F1BE96E2E099}.Debug|Win32.Build.0 = Debug|Win32
+ {4C943AC7-0187-4AB9-A9DB-F1BE96E2E099}.Release|Win32.ActiveCfg = Release|Win32
+ {4C943AC7-0187-4AB9-A9DB-F1BE96E2E099}.Release|Win32.Build.0 = Release|Win32
+ {ACAE29AF-D15F-402E-AE0A-93141CF439C6}.Debug|Win32.ActiveCfg = Debug|Win32
+ {ACAE29AF-D15F-402E-AE0A-93141CF439C6}.Debug|Win32.Build.0 = Debug|Win32
+ {ACAE29AF-D15F-402E-AE0A-93141CF439C6}.Release|Win32.ActiveCfg = Release|Win32
+ {ACAE29AF-D15F-402E-AE0A-93141CF439C6}.Release|Win32.Build.0 = Release|Win32
+ {464DBF5A-69E8-4E1A-8401-171371B86299}.Debug|Win32.ActiveCfg = Debug|Win32
+ {464DBF5A-69E8-4E1A-8401-171371B86299}.Debug|Win32.Build.0 = Debug|Win32
+ {464DBF5A-69E8-4E1A-8401-171371B86299}.Release|Win32.ActiveCfg = Release|Win32
+ {464DBF5A-69E8-4E1A-8401-171371B86299}.Release|Win32.Build.0 = Release|Win32
+ {AC9279F5-5C6F-477F-AA3B-A42F8859D236}.Debug|Win32.ActiveCfg = Debug|Win32
+ {AC9279F5-5C6F-477F-AA3B-A42F8859D236}.Debug|Win32.Build.0 = Debug|Win32
+ {AC9279F5-5C6F-477F-AA3B-A42F8859D236}.Release|Win32.ActiveCfg = Release|Win32
+ {AC9279F5-5C6F-477F-AA3B-A42F8859D236}.Release|Win32.Build.0 = Release|Win32
+ {4815F7F0-BA32-4D79-A041-A146B0130D9E}.Debug|Win32.ActiveCfg = Debug|Win32
+ {4815F7F0-BA32-4D79-A041-A146B0130D9E}.Debug|Win32.Build.0 = Debug|Win32
+ {4815F7F0-BA32-4D79-A041-A146B0130D9E}.Release|Win32.ActiveCfg = Release|Win32
+ {4815F7F0-BA32-4D79-A041-A146B0130D9E}.Release|Win32.Build.0 = Release|Win32
+ {FD603999-011A-458C-9677-D596E25A620C}.Debug|Win32.ActiveCfg = Debug|Win32
+ {FD603999-011A-458C-9677-D596E25A620C}.Debug|Win32.Build.0 = Debug|Win32
+ {FD603999-011A-458C-9677-D596E25A620C}.Release|Win32.ActiveCfg = Release|Win32
+ {FD603999-011A-458C-9677-D596E25A620C}.Release|Win32.Build.0 = Release|Win32
+ {3D30CD64-0C5F-4ABA-87BB-EFF641FDEBB1}.Debug|Win32.ActiveCfg = Debug|Win32
+ {3D30CD64-0C5F-4ABA-87BB-EFF641FDEBB1}.Debug|Win32.Build.0 = Debug|Win32
+ {3D30CD64-0C5F-4ABA-87BB-EFF641FDEBB1}.Release|Win32.ActiveCfg = Release|Win32
+ {3D30CD64-0C5F-4ABA-87BB-EFF641FDEBB1}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
- GlobalSection(ProjectConfiguration) = postSolution
- {4C943AC7-0187-4AB9-A9DB-F1BE96E2E099}.Debug.ActiveCfg = Debug|Win32
- {4C943AC7-0187-4AB9-A9DB-F1BE96E2E099}.Debug.Build.0 = Debug|Win32
- {4C943AC7-0187-4AB9-A9DB-F1BE96E2E099}.Release.ActiveCfg = Release|Win32
- {4C943AC7-0187-4AB9-A9DB-F1BE96E2E099}.Release.Build.0 = Release|Win32
- {ACAE29AF-D15F-402E-AE0A-93141CF439C6}.Debug.ActiveCfg = Debug|Win32
- {ACAE29AF-D15F-402E-AE0A-93141CF439C6}.Debug.Build.0 = Debug|Win32
- {ACAE29AF-D15F-402E-AE0A-93141CF439C6}.Release.ActiveCfg = Release|Win32
- {ACAE29AF-D15F-402E-AE0A-93141CF439C6}.Release.Build.0 = Release|Win32
- {464DBF5A-69E8-4E1A-8401-171371B86299}.Debug.ActiveCfg = Debug|Win32
- {464DBF5A-69E8-4E1A-8401-171371B86299}.Debug.Build.0 = Debug|Win32
- {464DBF5A-69E8-4E1A-8401-171371B86299}.Release.ActiveCfg = Release|Win32
- {464DBF5A-69E8-4E1A-8401-171371B86299}.Release.Build.0 = Release|Win32
- {AC9279F5-5C6F-477F-AA3B-A42F8859D236}.Debug.ActiveCfg = Debug|Win32
- {AC9279F5-5C6F-477F-AA3B-A42F8859D236}.Debug.Build.0 = Debug|Win32
- {AC9279F5-5C6F-477F-AA3B-A42F8859D236}.Release.ActiveCfg = Release|Win32
- {AC9279F5-5C6F-477F-AA3B-A42F8859D236}.Release.Build.0 = Release|Win32
- {4815F7F0-BA32-4D79-A041-A146B0130D9E}.Debug.ActiveCfg = Debug|Win32
- {4815F7F0-BA32-4D79-A041-A146B0130D9E}.Debug.Build.0 = Debug|Win32
- {4815F7F0-BA32-4D79-A041-A146B0130D9E}.Release.ActiveCfg = Release|Win32
- {4815F7F0-BA32-4D79-A041-A146B0130D9E}.Release.Build.0 = Release|Win32
- {FD603999-011A-458C-9677-D596E25A620C}.Debug.ActiveCfg = Debug|Win32
- {FD603999-011A-458C-9677-D596E25A620C}.Debug.Build.0 = Debug|Win32
- {FD603999-011A-458C-9677-D596E25A620C}.Release.ActiveCfg = Release|Win32
- {FD603999-011A-458C-9677-D596E25A620C}.Release.Build.0 = Release|Win32
- {3D30CD64-0C5F-4ABA-87BB-EFF641FDEBB1}.Debug.ActiveCfg = Debug|Win32
- {3D30CD64-0C5F-4ABA-87BB-EFF641FDEBB1}.Debug.Build.0 = Debug|Win32
- {3D30CD64-0C5F-4ABA-87BB-EFF641FDEBB1}.Release.ActiveCfg = Release|Win32
- {3D30CD64-0C5F-4ABA-87BB-EFF641FDEBB1}.Release.Build.0 = Release|Win32
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- EndGlobalSection
- GlobalSection(ExtensibilityAddIns) = postSolution
- EndGlobalSection
EndGlobal
Modified: branches/R2_14/Externals/expat/lib/expat.vcproj
===================================================================
--- branches/R2_14/Externals/expat/lib/expat.vcproj 2010-10-24 11:59:07 UTC (rev 7349)
+++ branches/R2_14/Externals/expat/lib/expat.vcproj 2010-10-24 18:45:42 UTC (rev 7350)
@@ -1,24 +1,50 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="7.10"
+ Version="8.00"
Name="expat"
- SccProjectName=""
- SccLocalPath="">
+ ProjectGUID="{ACAE29AF-D15F-402E-AE0A-93141CF439C6}"
+ >
<Platforms>
<Platform
- Name="Win32"/>
+ Name="Win32"
+ />
</Platforms>
+ <ToolFiles>
+ </ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory=".\../../../Build/expat/lib/Debug"
IntermediateDirectory=".\../../../BuildTmp/expat/lib/Debug"
ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
<Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="_DEBUG"
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="1"
+ TypeLibraryName=".\../../../Build/expat/lib/Debug/expat.tlb"
+ HeaderFileName=""
+ />
+ <Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_USRDLL"
@@ -30,108 +56,145 @@
ProgramDataBaseFileName=".\../../../BuildTmp/expat/lib/Debug/"
BrowseInformation="1"
WarningLevel="3"
- SuppressStartupBanner="TRUE"
- DebugInformationFormat="4"/>
+ SuppressStartupBanner="true"
+ DebugInformationFormat="4"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
Name="VCLinkerTool"
OutputFile="../../../Build/expat/lib/Debug/libexpat.dll"
LinkIncremental="2"
- SuppressStartupBanner="TRUE"
+ SuppressStartupBanner="true"
ModuleDefinitionFile=".\libexpat.def"
- GenerateDebugInformation="TRUE"
+ GenerateDebugInformation="true"
ImportLibrary=".\../../../Build/expat/lib/Debug/libexpat.lib"
- TargetMachine="1"/>
+ TargetMachine="1"
+ />
<Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG"
- MkTypLibCompatible="TRUE"
- SuppressStartupBanner="TRUE"
- TargetEnvironment="1"
- TypeLibraryName=".\../../../Build/expat/lib/Debug/expat.tlb"
- HeaderFileName=""/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManifestTool"
+ />
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCAppVerifierTool"
+ />
<Tool
- Name="VCXMLDataGeneratorTool"/>
+ Name="VCWebDeploymentTool"
+ />
<Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory=".\../../../Build/expat/lib/Release"
IntermediateDirectory=".\../../../BuildTmp/expat/lib/Release"
ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
<Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="NDEBUG"
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="1"
+ TypeLibraryName=".\../../../Build/expat/lib/Release/expat.tlb"
+ HeaderFileName=""
+ />
+ <Tool
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL;COMPILED_FROM_DSP"
- StringPooling="TRUE"
+ StringPooling="true"
RuntimeLibrary="0"
- EnableFunctionLevelLinking="TRUE"
+ EnableFunctionLevelLinking="true"
PrecompiledHeaderFile=".\../../../BuildTmp/expat/lib/Release/expat.pch"
AssemblerListingLocation=".\../../../BuildTmp/expat/lib/Release/"
ObjectFile=".\../../../BuildTmp/expat/lib/Release/"
ProgramDataBaseFileName=".\../../../BuildTmp/expat/lib/Release/"
WarningLevel="3"
- SuppressStartupBanner="TRUE"/>
+ SuppressStartupBanner="true"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
Name="VCLinkerTool"
OutputFile="../../../Build/expat/lib/Release/libexpat.dll"
LinkIncremental="1"
- SuppressStartupBanner="TRUE"
+ SuppressStartupBanner="true"
ModuleDefinitionFile=".\libexpat.def"
ImportLibrary=".\../../../Build/expat/lib/Release/libexpat.lib"
- TargetMachine="1"/>
+ TargetMachine="1"
+ />
<Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
- MkTypLibCompatible="TRUE"
- SuppressStartupBanner="TRUE"
- TargetEnvironment="1"
- TypeLibraryName=".\../../../Build/expat/lib/Release/expat.tlb"
- HeaderFileName=""/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManifestTool"
+ />
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCAppVerifierTool"
+ />
<Tool
- Name="VCXMLDataGeneratorTool"/>
+ Name="VCWebDeploymentTool"
+ />
<Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
</Configurations>
<References>
@@ -139,150 +202,191 @@
<Files>
<Filter
Name="Source Files"
- Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
<File
- RelativePath="libexpat.def">
+ RelativePath="libexpat.def"
+ >
</File>
<File
- RelativePath="xmlparse.c">
+ RelativePath="xmlparse.c"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
- ExceptionHandling="FALSE"
+ ExceptionHandling="0"
BasicRuntimeChecks="3"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_MBCS;_USRDLL;COMPILED_FROM_DSP;$(NoInherit)"/>
+ PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_MBCS;_USRDLL;COMPILED_FROM_DSP;$(NoInherit)"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="xmlrole.c">
+ RelativePath="xmlrole.c"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
BasicRuntimeChecks="3"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_MBCS;_USRDLL;COMPILED_FROM_DSP;$(NoInherit)"/>
+ PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_MBCS;_USRDLL;COMPILED_FROM_DSP;$(NoInherit)"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="xmltok.c">
+ RelativePath="xmltok.c"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
BasicRuntimeChecks="3"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_MBCS;_USRDLL;COMPILED_FROM_DSP;$(NoInherit)"/>
+ PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_MBCS;_USRDLL;COMPILED_FROM_DSP;$(NoInherit)"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="xmltok_impl.c">
+ RelativePath="xmltok_impl.c"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
BasicRuntimeChecks="3"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_MBCS;_USRDLL;COMPILED_FROM_DSP;$(NoInherit)"/>
+ PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_MBCS;_USRDLL;COMPILED_FROM_DSP;$(NoInherit)"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="xmltok_ns.c">
+ RelativePath="xmltok_ns.c"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
BasicRuntimeChecks="3"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_MBCS;_USRDLL;COMPILED_FROM_DSP;$(NoInherit)"/>
+ PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_MBCS;_USRDLL;COMPILED_FROM_DSP;$(NoInherit)"
+ />
</FileConfiguration>
</File>
</Filter>
<Filter
Name="Header Files"
- Filter="h;hpp;hxx;hm;inl">
+ Filter="h;hpp;hxx;hm;inl"
+ >
<File
- RelativePath="ascii.h">
+ RelativePath="ascii.h"
+ >
</File>
<File
- RelativePath="asciitab.h">
+ RelativePath="asciitab.h"
+ >
</File>
<File
- RelativePath="expat.h">
+ RelativePath="expat.h"
+ >
</File>
<File
- RelativePath="expat_external.h">
+ RelativePath="expat_external.h"
+ >
</File>
<File
- RelativePath="iasciitab.h">
+ RelativePath="iasciitab.h"
+ >
</File>
<File
- RelativePath="internal.h">
+ RelativePath="internal.h"
+ >
</File>
<File
- RelativePath="latin1tab.h">
+ RelativePath="latin1tab.h"
+ >
</File>
<File
- RelativePath="nametab.h">
+ RelativePath="nametab.h"
+ >
</File>
<File
- RelativePath="utf8tab.h">
+ RelativePath="utf8tab.h"
+ >
</File>
<File
- RelativePath="xmlrole.h">
+ RelativePath="xmlrole.h"
+ >
</File>
<File
- RelativePath="xmltok.h">
+ RelativePath="xmltok.h"
+ >
</File>
<File
- RelativePath="xmltok_impl.h">
+ RelativePath="xmltok_impl.h"
+ >
</File>
</Filter>
<Filter
Name="Resource Files"
- Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+ >
</Filter>
</Files>
<Globals>
Modified: branches/R2_14/Externals/expat/lib/expat_static.vcproj
===================================================================
--- branches/R2_14/Externals/expat/lib/expat_static.vcproj 2010-10-24 11:59:07 UTC (rev 7349)
+++ branches/R2_14/Externals/expat/lib/expat_static.vcproj 2010-10-24 18:45:42 UTC (rev 7350)
@@ -1,24 +1,44 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="7.10"
+ Version="8.00"
Name="expat_static"
- SccProjectName=""
- SccLocalPath="">
+ ProjectGUID="{464DBF5A-69E8-4E1A-8401-171371B86299}"
+ >
<Platforms>
<Platform
- Name="Win32"/>
+ Name="Win32"
+ />
</Platforms>
+ <ToolFiles>
+ </ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory=".\../../../Build/expat/lib/Debug_static"
IntermediateDirectory=".\../../../BuildTmp/expat/lib/Debug_static"
ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
<Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;COMPILED_FROM_DSP;_LIB"
@@ -30,83 +50,112 @@
ProgramDataBaseFileName=".\../../../BuildTmp/expat/lib/Debug_static/"
BrowseInformation="1"
WarningLevel="3"
- SuppressStartupBanner="TRUE"
- DebugInformationFormat="4"/>
+ SuppressStartupBanner="true"
+ DebugInformationFormat="4"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
Name="VCLibrarianTool"
OutputFile="../../../Build/expat/lib/Debug_static/libexpatMT.lib"
- SuppressStartupBanner="TRUE"/>
+ SuppressStartupBanner="true"
+ />
<Tool
- Name="VCMIDLTool"/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory=".\../../../Build/expat/lib/Release_static"
IntermediateDirectory=".\../../../BuildTmp/expat/lib/Release_static"
ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
<Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_LIB;COMPILED_FROM_DSP"
- StringPooling="TRUE"
+ StringPooling="true"
RuntimeLibrary="0"
- EnableFunctionLevelLinking="TRUE"
+ EnableFunctionLevelLinking="true"
PrecompiledHeaderFile=".\../../../BuildTmp/expat/lib/Release_static/expat_static.pch"
AssemblerListingLocation=".\../../../BuildTmp/expat/lib/Release_static/"
ObjectFile=".\../../../BuildTmp/expat/lib/Release_static/"
ProgramDataBaseFileName=".\../../../BuildTmp/expat/lib/Release_static/"
WarningLevel="3"
- SuppressStartupBanner="TRUE"/>
+ SuppressStartupBanner="true"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
Name="VCLibrarianTool"
OutputFile="../../../Build/expat/lib/Release_static/libexpatMT.lib"
- SuppressStartupBanner="TRUE"/>
+ SuppressStartupBanner="true"
+ />
<Tool
- Name="VCMIDLTool"/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
</Configurations>
<References>
@@ -114,141 +163,180 @@
<Files>
<Filter
Name="Source Files"
- Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
<File
- RelativePath="xmlparse.c">
+ RelativePath="xmlparse.c"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- PreprocessorDefinitions=""/>
+ PreprocessorDefinitions=""
+ />
</FileConfiguration>
</File>
<File
- RelativePath="xmlrole.c">
+ RelativePath="xmlrole.c"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- PreprocessorDefinitions=""/>
+ PreprocessorDefinitions=""
+ />
</FileConfiguration>
</File>
<File
- RelativePath="xmltok.c">
+ RelativePath="xmltok.c"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- PreprocessorDefinitions=""/>
+ PreprocessorDefinitions=""
+ />
</FileConfiguration>
</File>
<File
- RelativePath="xmltok_impl.c">
+ RelativePath="xmltok_impl.c"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- PreprocessorDefinitions=""/>
+ PreprocessorDefinitions=""
+ />
</FileConfiguration>
</File>
<File
- RelativePath="xmltok_ns.c">
+ RelativePath="xmltok_ns.c"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- PreprocessorDefinitions=""/>
+ PreprocessorDefinitions=""
+ />
</FileConfiguration>
</File>
</Filter>
<Filter
Name="Header Files"
- Filter="h;hpp;hxx;hm;inl">
+ Filter="h;hpp;hxx;hm;inl"
+ >
<File
- RelativePath="ascii.h">
+ RelativePath="ascii.h"
+ >
</File>
<File
- RelativePath="asciitab.h">
+ RelativePath="asciitab.h"
+ >
</File>
<File
- RelativePath="expat.h">
+ RelativePath="expat.h"
+ >
</File>
<File
- RelativePath="expat_external.h">
+ RelativePath="expat_external.h"
+ >
</File>
<File
- RelativePath="iasciitab.h">
+ RelativePath="iasciitab.h"
+ >
</File>
<File
- RelativePath="internal.h">
+ RelativePath="internal.h"
+ >
</File>
<File
- RelativePath="latin1tab.h">
+ RelativePath="latin1tab.h"
+ >
</File>
<File
- RelativePath="nametab.h">
+ RelativePath="nametab.h"
+ >
</File>
<File
- RelativePath="utf8tab.h">
+ RelativePath="utf8tab.h"
+ >
</File>
<File
- RelativePath="xmlrole.h">
+ RelativePath="xmlrole.h"
+ >
</File>
<File
- RelativePath="xmltok.h">
+ RelativePath="xmltok.h"
+ >
</File>
<File
- RelativePath="xmltok_impl.h">
+ RelativePath="xmltok_impl.h"
+ >
</File>
</Filter>
</Files>
Modified: branches/R2_14/Externals/expat/lib/expatw.vcproj
===================================================================
--- branches/R2_14/Externals/expat/lib/expatw.vcproj 2010-10-24 11:59:07 UTC (rev 7349)
+++ branches/R2_14/Externals/expat/lib/expatw.vcproj 2010-10-24 18:45:42 UTC (rev 7350)
@@ -1,85 +1,141 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="7.10"
+ Version="8.00"
Name="expatw"
- SccProjectName=""
- SccLocalPath="">
+ ProjectGUID="{AC9279F5-5C6F-477F-AA3B-A42F8859D236}"
+ >
<Platforms>
<Platform
- Name="Win32"/>
+ Name="Win32"
+ />
</Platforms>
+ <ToolFiles>
+ </ToolFiles>
<Configurations>
<Configuration
Name="Release|Win32"
OutputDirectory=".\../../../Build/expat/lib/Release-w"
IntermediateDirectory=".\../../../BuildTmp/expat/lib/Release-w"
ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
<Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="NDEBUG"
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="1"
+ TypeLibraryName=".\../../../Build/expat/lib/Release-w/expatw.tlb"
+ HeaderFileName=""
+ />
+ <Tool
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_USRDLL;XML_UNICODE_WCHAR_T"
- StringPooling="TRUE"
+ StringPooling="true"
RuntimeLibrary="0"
- EnableFunctionLevelLinking="TRUE"
+ EnableFunctionLevelLinking="true"
PrecompiledHeaderFile=".\../../../BuildTmp/expat/lib/Release-w/expatw.pch"
AssemblerListingLocation=".\../../../BuildTmp/expat/lib/Release-w/"
ObjectFile=".\../../../BuildTmp/expat/lib/Release-w/"
ProgramDataBaseFileName=".\../../../BuildTmp/expat/lib/Release-w/"
WarningLevel="3"
- SuppressStartupBanner="TRUE"/>
+ SuppressStartupBanner="true"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
Name="VCLinkerTool"
OutputFile="../../../Build/expat/lib/Release-w/libexpatw.dll"
LinkIncremental="1"
- SuppressStartupBanner="TRUE"
+ SuppressStartupBanner="true"
ModuleDefinitionFile=".\libexpatw.def"
ImportLibrary=".\../../../Build/expat/lib/Release-w/libexpatw.lib"
- TargetMachine="1"/>
+ TargetMachine="1"
+ />
<Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
- MkTypLibCompatible="TRUE"
- SuppressStartupBanner="TRUE"
- TargetEnvironment="1"
- TypeLibraryName=".\../../../Build/expat/lib/Release-w/expatw.tlb"
- HeaderFileName=""/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManifestTool"
+ />
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCAppVerifierTool"
+ />
<Tool
- Name="VCXMLDataGeneratorTool"/>
+ Name="VCWebDeploymentTool"
+ />
<Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
<Configuration
Name="Debug|Win32"
OutputDirectory=".\../../../Build/expat/lib/Debug-w"
IntermediateDirectory=".\../../../BuildTmp/expat/lib/Debug-w"
ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
<Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="_DEBUG"
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="1"
+ TypeLibraryName=".\../../../Build/expat/lib/Debug-w/expatw.tlb"
+ HeaderFileName=""
+ />
+ <Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_USRDLL;XML_UNICODE_WCHAR_T"
@@ -91,47 +147,54 @@
ProgramDataBaseFileName=".\../../../BuildTmp/expat/lib/Debug-w/"
BrowseInformation="1"
WarningLevel="3"
- SuppressStartupBanner="TRUE"
- DebugInformationFormat="4"/>
+ SuppressStartupBanner="true"
+ DebugInformationFormat="4"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
Name="VCLinkerTool"
OutputFile="../../../Build/expat/lib/Debug-w/libexpatw.dll"
LinkIncremental="2"
- SuppressStartupBanner="TRUE"
+ SuppressStartupBanner="true"
ModuleDefinitionFile=".\libexpatw.def"
- GenerateDebugInformation="TRUE"
+ GenerateDebugInformation="true"
ImportLibrary=".\../../../Build/expat/lib/Debug-w/libexpatw.lib"
- TargetMachine="1"/>
+ TargetMachine="1"
+ />
<Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG"
- MkTypLibCompatible="TRUE"
- SuppressStartupBanner="TRUE"
- TargetEnvironment="1"
- TypeLibraryName=".\../../../Build/expat/lib/Debug-w/expatw.tlb"
- HeaderFileName=""/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManifestTool"
+ />
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCAppVerifierTool"
+ />
<Tool
- Name="VCXMLDataGeneratorTool"/>
+ Name="VCWebDeploymentTool"
+ />
<Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
</Configurations>
<References>
@@ -139,150 +202,191 @@
<Files>
<Filter
Name="Source Files"
- Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
<File
- RelativePath="libexpatw.def">
+ RelativePath="libexpatw.def"
+ >
</File>
<File
- RelativePath="xmlparse.c">
+ RelativePath="xmlparse.c"
+ >
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;XML_UNICODE_WCHAR_T;$(NoInherit)"/>
+ PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;XML_UNICODE_WCHAR_T;$(NoInherit)"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;XML_UNICODE_WCHAR_T;$(NoInherit)"
- ExceptionHandling="FALSE"
+ ExceptionHandling="0"
BasicRuntimeChecks="3"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="xmlrole.c">
+ RelativePath="xmlrole.c"
+ >
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;XML_UNICODE_WCHAR_T;$(NoInherit)"/>
+ PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;XML_UNICODE_WCHAR_T;$(NoInherit)"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;XML_UNICODE_WCHAR_T;$(NoInherit)"
BasicRuntimeChecks="3"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="xmltok.c">
+ RelativePath="xmltok.c"
+ >
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;XML_UNICODE_WCHAR_T;$(NoInherit)"/>
+ PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;XML_UNICODE_WCHAR_T;$(NoInherit)"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;XML_UNICODE_WCHAR_T;$(NoInherit)"
BasicRuntimeChecks="3"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="xmltok_impl.c">
+ RelativePath="xmltok_impl.c"
+ >
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;XML_UNICODE_WCHAR_T;$(NoInherit)"/>
+ PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;XML_UNICODE_WCHAR_T;$(NoInherit)"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;XML_UNICODE_WCHAR_T;$(NoInherit)"
BasicRuntimeChecks="3"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="xmltok_ns.c">
+ RelativePath="xmltok_ns.c"
+ >
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;XML_UNICODE_WCHAR_T;$(NoInherit)"/>
+ PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;XML_UNICODE_WCHAR_T;$(NoInherit)"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;XML_UNICODE_WCHAR_T;$(NoInherit)"
BasicRuntimeChecks="3"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
</File>
</Filter>
<Filter
Name="Header Files"
- Filter="h;hpp;hxx;hm;inl">
+ Filter="h;hpp;hxx;hm;inl"
+ >
<File
- RelativePath="ascii.h">
+ RelativePath="ascii.h"
+ >
</File>
<File
- RelativePath="asciitab.h">
+ RelativePath="asciitab.h"
+ >
</File>
<File
- RelativePath="expat.h">
+ RelativePath="expat.h"
+ >
</File>
<File
- RelativePath="expat_external.h">
+ RelativePath="expat_external.h"
+ >
</File>
<File
- RelativePath="iasciitab.h">
+ RelativePath="iasciitab.h"
+ >
</File>
<File
- RelativePath="internal.h">
+ RelativePath="internal.h"
+ >
</File>
<File
- RelativePath="latin1tab.h">
+ RelativePath="latin1tab.h"
+ >
</File>
<File
- RelativePath="nametab.h">
+ RelativePath="nametab.h"
+ >
</File>
<File
- RelativePath="utf8tab.h">
+ RelativePath="utf8tab.h"
+ >
</File>
<File
- RelativePath="xmlrole.h">
+ RelativePath="xmlrole.h"
+ >
</File>
<File
- RelativePath="xmltok.h">
+ RelativePath="xmltok.h"
+ >
</File>
<File
- RelativePath="xmltok_impl.h">
+ RelativePath="xmltok_impl.h"
+ >
</File>
</Filter>
<Filter
Name="Resource Files"
- Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+ >
</Filter>
</Files>
<Globals>
Modified: branches/R2_14/Externals/expat/lib/expatw_static.vcproj
===================================================================
--- branches/R2_14/Externals/expat/lib/expatw_static.vcproj 2010-10-24 11:59:07 UTC (rev 7349)
+++ branches/R2_14/Externals/expat/lib/expatw_static.vcproj 2010-10-24 18:45:42 UTC (rev 7350)
@@ -1,73 +1,116 @@
<?xml version="1.0" encoding="Windows-1252"?>
...
[truncated message content] |
