You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(148) |
Oct
(84) |
Nov
(130) |
Dec
(121) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(89) |
Feb
(50) |
Mar
(81) |
Apr
(45) |
May
(42) |
Jun
(46) |
Jul
(40) |
Aug
(98) |
Sep
(80) |
Oct
(101) |
Nov
(128) |
Dec
(46) |
| 2008 |
Jan
(132) |
Feb
(117) |
Mar
(118) |
Apr
(112) |
May
(69) |
Jun
(140) |
Jul
(164) |
Aug
(159) |
Sep
(115) |
Oct
(65) |
Nov
(80) |
Dec
(128) |
| 2009 |
Jan
(145) |
Feb
(97) |
Mar
(118) |
Apr
(87) |
May
(96) |
Jun
(83) |
Jul
(50) |
Aug
(42) |
Sep
(18) |
Oct
(32) |
Nov
(12) |
Dec
(35) |
| 2010 |
Jan
(38) |
Feb
(8) |
Mar
(5) |
Apr
(19) |
May
(23) |
Jun
(39) |
Jul
(16) |
Aug
(4) |
Sep
(60) |
Oct
(100) |
Nov
(57) |
Dec
(43) |
| 2011 |
Jan
(25) |
Feb
(1) |
Mar
(3) |
Apr
|
May
(13) |
Jun
(19) |
Jul
|
Aug
(6) |
Sep
(5) |
Oct
(6) |
Nov
|
Dec
(1) |
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(2) |
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
(19) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2018 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2019 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ki...@us...> - 2010-01-11 21:17:16
|
Revision: 7093
http://winmerge.svn.sourceforge.net/winmerge/?rev=7093&view=rev
Author: kimmov
Date: 2010-01-11 21:17:08 +0000 (Mon, 11 Jan 2010)
Log Message:
-----------
Fix 64-bit ShellExtension build paths.
Modified Paths:
--------------
trunk/ShellExtension/ShellExtension.vcproj
Modified: trunk/ShellExtension/ShellExtension.vcproj
===================================================================
--- trunk/ShellExtension/ShellExtension.vcproj 2010-01-11 20:45:25 UTC (rev 7092)
+++ trunk/ShellExtension/ShellExtension.vcproj 2010-01-11 21:17:08 UTC (rev 7093)
@@ -113,13 +113,12 @@
/>
</Configuration>
<Configuration
- Name="Unicode Release MinSize|Win32"
- OutputDirectory=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize"
- IntermediateDirectory=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize"
+ Name="Unicode Debug|x64"
+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
- UseOfATL="2"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="1"
>
@@ -128,6 +127,9 @@
/>
<Tool
Name="VCCustomBuildTool"
+ Description="Performing registration"
+ CommandLine="if "%OS%"=="" goto NOTNT
if not "%OS%"=="Windows_NT" goto NOTNT
regsvr32 /s /c "$(TargetPath)"
echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg"
goto end
:NOTNT
echo Warning : Cannot register Unicode DLL on Windows 95
:end
"
+ Outputs="$(OutDir)\regsvr32.trg"
/>
<Tool
Name="VCXMLDataGeneratorTool"
@@ -137,25 +139,25 @@
/>
<Tool
Name="VCMIDLTool"
- TypeLibraryName=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/ShellExtension.tlb"
+ TargetEnvironment="3"
+ TypeLibraryName=".\..\BuildTmp\ShellExtension__UnicodeDebug/ShellExtension.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="1"
- InlineFunctionExpansion="1"
+ Optimization="0"
AdditionalIncludeDirectories=".,../src/common"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_ATL_NO_UUIDOF"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_ATL_NO_UUIDOF"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
UsePrecompiledHeader="0"
- PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/ShellExtension.pch"
- AssemblerListingLocation=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/"
- ObjectFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/"
- ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/"
+ PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__UnicodeDebug/ShellExtension.pch"
+ AssemblerListingLocation=".\..\BuildTmp\ShellExtension__UnicodeDebug/"
+ ObjectFile=".\..\BuildTmp\ShellExtension__UnicodeDebug/"
+ ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__UnicodeDebug/"
WarningLevel="3"
SuppressStartupBanner="true"
+ DebugInformationFormat="3"
CompileAs="0"
/>
<Tool
@@ -163,7 +165,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="_DEBUG"
Culture="1033"
/>
<Tool
@@ -171,14 +173,15 @@
/>
<Tool
Name="VCLinkerTool"
- OutputFile="..\Build\MergeUnicodeRelease\ShellExtensionU.dll"
+ OutputFile="..\Build\MergeUnicodeDebug\ShellExtensionU.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
ModuleDefinitionFile=".\ShellExtensionU.def"
- ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/ShellExtensionU.pdb"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__UnicodeDebug/ShellExtensionU.pdb"
SubSystem="2"
- ImportLibrary=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/ShellExtensionU.lib"
- TargetMachine="1"
+ ImportLibrary=".\..\BuildTmp\ShellExtension__UnicodeDebug/ShellExtensionU.lib"
+ TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
@@ -206,13 +209,13 @@
/>
</Configuration>
<Configuration
- Name="Unicode Release MinDependency|Win32"
- OutputDirectory=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency"
- IntermediateDirectory=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency"
+ Name="Unicode Release MinSize|Win32"
+ OutputDirectory=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize"
+ IntermediateDirectory=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
- UseOfATL="1"
+ UseOfATL="2"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="1"
>
@@ -230,7 +233,7 @@
/>
<Tool
Name="VCMIDLTool"
- TypeLibraryName=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/ShellExtension.tlb"
+ TypeLibraryName=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/ShellExtension.tlb"
HeaderFileName=""
/>
<Tool
@@ -243,10 +246,10 @@
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
- PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/ShellExtension.pch"
- AssemblerListingLocation=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/"
- ObjectFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/"
- ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/"
+ PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/ShellExtension.pch"
+ AssemblerListingLocation=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/"
+ ObjectFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/"
+ ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/"
WarningLevel="3"
SuppressStartupBanner="true"
CompileAs="0"
@@ -268,9 +271,9 @@
LinkIncremental="1"
SuppressStartupBanner="true"
ModuleDefinitionFile=".\ShellExtensionU.def"
- ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/ShellExtensionU.pdb"
+ ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/ShellExtensionU.pdb"
SubSystem="2"
- ImportLibrary=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/ShellExtensionU.lib"
+ ImportLibrary=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/ShellExtensionU.lib"
TargetMachine="1"
/>
<Tool
@@ -299,15 +302,15 @@
/>
</Configuration>
<Configuration
- Name="Release MinDependency|Win32"
- OutputDirectory=".\..\BuildTmp\ShellExtension__ReleaseMinDependency"
- IntermediateDirectory=".\..\BuildTmp\ShellExtension__ReleaseMinDependency"
+ Name="Unicode Release MinSize|x64"
+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
- UseOfATL="1"
+ UseOfATL="2"
ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
+ CharacterSet="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -323,24 +326,24 @@
/>
<Tool
Name="VCMIDLTool"
- TypeLibraryName=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/ShellExtension.tlb"
+ TargetEnvironment="3"
+ TypeLibraryName=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/ShellExtension.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions="/D "NDEBUG""
Optimization="1"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".,../src/common"
- PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;_ATL_NO_UUIDOF"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_ATL_NO_UUIDOF"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
- PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/ShellExtension.pch"
- AssemblerListingLocation=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/"
- ObjectFile=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/"
- ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/"
+ PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/ShellExtension.pch"
+ AssemblerListingLocation=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/"
+ ObjectFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/"
+ ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/"
WarningLevel="3"
SuppressStartupBanner="true"
CompileAs="0"
@@ -358,14 +361,14 @@
/>
<Tool
Name="VCLinkerTool"
- OutputFile="..\Build\MergeRelease\ShellExtension.dll"
+ OutputFile="..\Build\MergeUnicodeRelease\ShellExtensionU.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
- ModuleDefinitionFile=".\ShellExtension.def"
- ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/ShellExtension.pdb"
+ ModuleDefinitionFile=".\ShellExtensionU.def"
+ ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/ShellExtensionU.pdb"
SubSystem="2"
- ImportLibrary=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/ShellExtension.lib"
- TargetMachine="1"
+ ImportLibrary=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/ShellExtensionU.lib"
+ TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
@@ -393,15 +396,15 @@
/>
</Configuration>
<Configuration
- Name="Release MinSize|Win32"
- OutputDirectory=".\..\BuildTmp\ShellExtension__ReleaseMinSize"
- IntermediateDirectory=".\..\BuildTmp\ShellExtension__ReleaseMinSize"
+ Name="Unicode Release MinDependency|Win32"
+ OutputDirectory=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency"
+ IntermediateDirectory=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
- UseOfATL="2"
+ UseOfATL="1"
ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
+ CharacterSet="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -417,24 +420,23 @@
/>
<Tool
Name="VCMIDLTool"
- TypeLibraryName=".\..\BuildTmp\ShellExtension__ReleaseMinSize/ShellExtension.tlb"
+ TypeLibraryName=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/ShellExtension.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions="/D "NDEBUG""
Optimization="1"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".,../src/common"
- PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;_ATL_NO_UUIDOF"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_ATL_NO_UUIDOF"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
- PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__ReleaseMinSize/ShellExtension.pch"
- AssemblerListingLocation=".\..\BuildTmp\ShellExtension__ReleaseMinSize/"
- ObjectFile=".\..\BuildTmp\ShellExtension__ReleaseMinSize/"
- ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__ReleaseMinSize/"
+ PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/ShellExtension.pch"
+ AssemblerListingLocation=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/"
+ ObjectFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/"
+ ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/"
WarningLevel="3"
SuppressStartupBanner="true"
CompileAs="0"
@@ -452,13 +454,13 @@
/>
<Tool
Name="VCLinkerTool"
- OutputFile="..\Build\MergeRelease\ShellExtension.dll"
+ OutputFile="..\Build\MergeUnicodeRelease\ShellExtensionU.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
- ModuleDefinitionFile=".\ShellExtension.def"
- ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__ReleaseMinSize/ShellExtension.pdb"
+ ModuleDefinitionFile=".\ShellExtensionU.def"
+ ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/ShellExtensionU.pdb"
SubSystem="2"
- ImportLibrary=".\..\BuildTmp\ShellExtension__ReleaseMinSize/ShellExtension.lib"
+ ImportLibrary=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/ShellExtensionU.lib"
TargetMachine="1"
/>
<Tool
@@ -487,23 +489,21 @@
/>
</Configuration>
<Configuration
- Name="Debug|Win32"
- OutputDirectory=".\..\BuildTmp\ShellExtension__Debug"
- IntermediateDirectory=".\..\BuildTmp\ShellExtension__Debug"
+ Name="Unicode Release MinDependency|x64"
+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
+ UseOfATL="1"
ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
+ CharacterSet="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
- Description="Performing registration"
- CommandLine="regsvr32 /s /c "$(TargetPath)"
echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg"
"
- Outputs="$(OutDir)\regsvr32.trg"
/>
<Tool
Name="VCXMLDataGeneratorTool"
@@ -513,24 +513,26 @@
/>
<Tool
Name="VCMIDLTool"
- TypeLibraryName=".\..\BuildTmp\ShellExtension__Debug/ShellExtension.tlb"
+ TargetEnvironment="3"
+ TypeLibraryName=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/ShellExtension.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
+ Optimization="1"
+ InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".,../src/common"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_ATL_NO_UUIDOF"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_ATL_NO_UUIDOF"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
- PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__Debug/ShellExtension.pch"
- AssemblerListingLocation=".\..\BuildTmp\ShellExtension__Debug/"
- ObjectFile=".\..\BuildTmp\ShellExtension__Debug/"
- ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__Debug/"
+ PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/ShellExtension.pch"
+ AssemblerListingLocation=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/"
+ ObjectFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/"
+ ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/"
WarningLevel="3"
SuppressStartupBanner="true"
- DebugInformationFormat="4"
CompileAs="0"
/>
<Tool
@@ -538,7 +540,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="NDEBUG"
Culture="1033"
/>
<Tool
@@ -546,15 +548,14 @@
/>
<Tool
Name="VCLinkerTool"
- OutputFile="..\Build\MergeDebug\ShellExtension.dll"
+ OutputFile="..\Build\MergeUnicodeRelease\ShellExtensionU.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
- ModuleDefinitionFile=".\ShellExtension.def"
- GenerateDebugInformation="true"
- ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__Debug/ShellExtension.pdb"
+ ModuleDefinitionFile=".\ShellExtensionU.def"
+ ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/ShellExtensionU.pdb"
SubSystem="2"
- ImportLibrary=".\..\BuildTmp\ShellExtension__Debug/ShellExtension.lib"
- TargetMachine="1"
+ ImportLibrary=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/ShellExtensionU.lib"
+ TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
@@ -582,23 +583,21 @@
/>
</Configuration>
<Configuration
- Name="X64 Debug|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ Name="Release MinDependency|Win32"
+ OutputDirectory=".\..\BuildTmp\ShellExtension__ReleaseMinDependency"
+ IntermediateDirectory=".\..\BuildTmp\ShellExtension__ReleaseMinDependency"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
+ UseOfATL="1"
ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
+ CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
- Description="Performing registration"
- CommandLine="if "%OS%"=="" goto NOTNT
if not "%OS%"=="Windows_NT" goto NOTNT
regsvr32 /s /c "$(TargetPath)"
echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg"
goto end
:NOTNT
echo Warning : Cannot register Unicode DLL on Windows 95
:end
"
- Outputs="$(OutDir)\regsvr32.trg"
/>
<Tool
Name="VCXMLDataGeneratorTool"
@@ -608,24 +607,26 @@
/>
<Tool
Name="VCMIDLTool"
- TypeLibraryName=".\..\BuildTmp\ShellExtension__UnicodeDebug/ShellExtension.tlb"
+ TypeLibraryName=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/ShellExtension.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
+ AdditionalOptions="/D "NDEBUG""
+ Optimization="1"
+ InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".,../src/common"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_ATL_NO_UUIDOF"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
+ PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;_ATL_NO_UUIDOF"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
- PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__UnicodeDebug/ShellExtension.pch"
- AssemblerListingLocation=".\..\BuildTmp\ShellExtension__UnicodeDebug/"
- ObjectFile=".\..\BuildTmp\ShellExtension__UnicodeDebug/"
- ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__UnicodeDebug/"
+ PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/ShellExtension.pch"
+ AssemblerListingLocation=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/"
+ ObjectFile=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/"
+ ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/"
WarningLevel="3"
SuppressStartupBanner="true"
- DebugInformationFormat="4"
CompileAs="0"
/>
<Tool
@@ -633,7 +634,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="NDEBUG"
Culture="1033"
/>
<Tool
@@ -641,14 +642,13 @@
/>
<Tool
Name="VCLinkerTool"
- OutputFile="..\Build\MergeUnicodeDebug\ShellExtensionU.dll"
+ OutputFile="..\Build\MergeRelease\ShellExtension.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
- ModuleDefinitionFile=".\ShellExtensionU.def"
- GenerateDebugInformation="true"
- ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__UnicodeDebug/ShellExtensionU.pdb"
+ ModuleDefinitionFile=".\ShellExtension.def"
+ ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/ShellExtension.pdb"
SubSystem="2"
- ImportLibrary=".\..\BuildTmp\ShellExtension__UnicodeDebug/ShellExtensionU.lib"
+ ImportLibrary=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/ShellExtension.lib"
TargetMachine="1"
/>
<Tool
@@ -677,23 +677,21 @@
/>
</Configuration>
<Configuration
- Name="Unicode Debug|x64"
+ Name="Release MinDependency|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
+ UseOfATL="1"
ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
+ CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
- Description="Performing registration"
- CommandLine="if "%OS%"=="" goto NOTNT
if not "%OS%"=="Windows_NT" goto NOTNT
regsvr32 /s /c "$(TargetPath)"
echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg"
goto end
:NOTNT
echo Warning : Cannot register Unicode DLL on Windows 95
:end
"
- Outputs="$(OutDir)\regsvr32.trg"
/>
<Tool
Name="VCXMLDataGeneratorTool"
@@ -704,24 +702,26 @@
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
- TypeLibraryName=".\..\BuildTmp\ShellExtension__UnicodeDebug/ShellExtension.tlb"
+ TypeLibraryName=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/ShellExtension.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
+ AdditionalOptions="/D "NDEBUG""
+ Optimization="1"
+ InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".,../src/common"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_ATL_NO_UUIDOF"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
+ PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;_ATL_NO_UUIDOF"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
- PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__UnicodeDebug/ShellExtension.pch"
- AssemblerListingLocation=".\..\BuildTmp\ShellExtension__UnicodeDebug/"
- ObjectFile=".\..\BuildTmp\ShellExtension__UnicodeDebug/"
- ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__UnicodeDebug/"
+ PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/ShellExtension.pch"
+ AssemblerListingLocation=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/"
+ ObjectFile=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/"
+ ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/"
WarningLevel="3"
SuppressStartupBanner="true"
- DebugInformationFormat="3"
CompileAs="0"
/>
<Tool
@@ -729,7 +729,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="NDEBUG"
Culture="1033"
/>
<Tool
@@ -737,14 +737,13 @@
/>
<Tool
Name="VCLinkerTool"
- OutputFile="..\Build\MergeUnicodeDebug\ShellExtensionU.dll"
+ OutputFile="..\Build\MergeRelease\ShellExtension.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
- ModuleDefinitionFile=".\ShellExtensionU.def"
- GenerateDebugInformation="true"
- ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__UnicodeDebug/ShellExtensionU.pdb"
+ ModuleDefinitionFile=".\ShellExtension.def"
+ ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/ShellExtension.pdb"
SubSystem="2"
- ImportLibrary=".\..\BuildTmp\ShellExtension__UnicodeDebug/ShellExtensionU.lib"
+ ImportLibrary=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/ShellExtension.lib"
TargetMachine="17"
/>
<Tool
@@ -773,15 +772,15 @@
/>
</Configuration>
<Configuration
- Name="Unicode Release MinSize|x64"
- OutputDirectory="$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ Name="Release MinSize|Win32"
+ OutputDirectory=".\..\BuildTmp\ShellExtension__ReleaseMinSize"
+ IntermediateDirectory=".\..\BuildTmp\ShellExtension__ReleaseMinSize"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
UseOfATL="2"
ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
+ CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
@@ -797,24 +796,24 @@
/>
<Tool
Name="VCMIDLTool"
- TargetEnvironment="3"
- TypeLibraryName=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/ShellExtension.tlb"
+ TypeLibraryName=".\..\BuildTmp\ShellExtension__ReleaseMinSize/ShellExtension.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/D "NDEBUG""
Optimization="1"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".,../src/common"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_ATL_NO_UUIDOF"
+ PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;_ATL_NO_UUIDOF"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
- PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/ShellExtension.pch"
- AssemblerListingLocation=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/"
- ObjectFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/"
- ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/"
+ PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__ReleaseMinSize/ShellExtension.pch"
+ AssemblerListingLocation=".\..\BuildTmp\ShellExtension__ReleaseMinSize/"
+ ObjectFile=".\..\BuildTmp\ShellExtension__ReleaseMinSize/"
+ ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__ReleaseMinSize/"
WarningLevel="3"
SuppressStartupBanner="true"
CompileAs="0"
@@ -832,14 +831,14 @@
/>
<Tool
Name="VCLinkerTool"
- OutputFile="..\Build\MergeUnicodeRelease\ShellExtensionU.dll"
+ OutputFile="..\Build\MergeRelease\ShellExtension.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
- ModuleDefinitionFile=".\ShellExtensionU.def"
- ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/ShellExtensionU.pdb"
+ ModuleDefinitionFile=".\ShellExtension.def"
+ ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__ReleaseMinSize/ShellExtension.pdb"
SubSystem="2"
- ImportLibrary=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/ShellExtensionU.lib"
- TargetMachine="17"
+ ImportLibrary=".\..\BuildTmp\ShellExtension__ReleaseMinSize/ShellExtension.lib"
+ TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
@@ -867,15 +866,15 @@
/>
</Configuration>
<Configuration
- Name="Unicode Release MinDependency|x64"
+ Name="Release MinSize|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
- UseOfATL="1"
+ UseOfATL="2"
ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
+ CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
@@ -892,23 +891,24 @@
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
- TypeLibraryName=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/ShellExtension.tlb"
+ TypeLibraryName=".\..\BuildTmp\ShellExtension__ReleaseMinSize/ShellExtension.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/D "NDEBUG""
Optimization="1"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".,../src/common"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_ATL_NO_UUIDOF"
+ PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;_ATL_NO_UUIDOF"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
- PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/ShellExtension.pch"
- AssemblerListingLocation=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/"
- ObjectFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/"
- ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/"
+ PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__ReleaseMinSize/ShellExtension.pch"
+ AssemblerListingLocation=".\..\BuildTmp\ShellExtension__ReleaseMinSize/"
+ ObjectFile=".\..\BuildTmp\ShellExtension__ReleaseMinSize/"
+ ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__ReleaseMinSize/"
WarningLevel="3"
SuppressStartupBanner="true"
CompileAs="0"
@@ -926,13 +926,13 @@
/>
<Tool
Name="VCLinkerTool"
- OutputFile="..\Build\MergeUnicodeRelease\ShellExtensionU.dll"
+ OutputFile="..\Build\MergeRelease\ShellExtension.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
- ModuleDefinitionFile=".\ShellExtensionU.def"
- ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/ShellExtensionU.pdb"
+ ModuleDefinitionFile=".\ShellExtension.def"
+ ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__ReleaseMinSize/ShellExtension.pdb"
SubSystem="2"
- ImportLibrary=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/ShellExtensionU.lib"
+ ImportLibrary=".\..\BuildTmp\ShellExtension__ReleaseMinSize/ShellExtension.lib"
TargetMachine="17"
/>
<Tool
@@ -961,13 +961,12 @@
/>
</Configuration>
<Configuration
- Name="Release MinDependency|x64"
- OutputDirectory="$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ Name="Debug|Win32"
+ OutputDirectory=".\..\BuildTmp\ShellExtension__Debug"
+ IntermediateDirectory=".\..\BuildTmp\ShellExtension__Debug"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
- UseOfATL="1"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
>
@@ -976,6 +975,9 @@
/>
<Tool
Name="VCCustomBuildTool"
+ Description="Performing registration"
+ CommandLine="regsvr32 /s /c "$(TargetPath)"
echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg"
"
+ Outputs="$(OutDir)\regsvr32.trg"
/>
<Tool
Name="VCXMLDataGeneratorTool"
@@ -985,27 +987,24 @@
/>
<Tool
Name="VCMIDLTool"
- TargetEnvironment="3"
- TypeLibraryName=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/ShellExtension.tlb"
+ TypeLibraryName=".\..\BuildTmp\ShellExtension__Debug/ShellExtension.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions="/D "NDEBUG""
- Optimization="1"
- InlineFunctionExpansion="1"
+ Optimization="0"
AdditionalIncludeDirectories=".,../src/common"
- PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;_ATL_NO_UUIDOF"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_ATL_NO_UUIDOF"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
UsePrecompiledHeader="0"
- PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/ShellExtension.pch"
- AssemblerListingLocation=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/"
- ObjectFile=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/"
- ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/"
+ PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__Debug/ShellExtension.pch"
+ AssemblerListingLocation=".\..\BuildTmp\ShellExtension__Debug/"
+ ObjectFile=".\..\BuildTmp\ShellExtension__Debug/"
+ ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__Debug/"
WarningLevel="3"
SuppressStartupBanner="true"
+ DebugInformationFormat="4"
CompileAs="0"
/>
<Tool
@@ -1013,7 +1012,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="_DEBUG"
Culture="1033"
/>
<Tool
@@ -1021,14 +1020,15 @@
/>
<Tool
Name="VCLinkerTool"
- OutputFile="..\Build\MergeRelease\ShellExtension.dll"
+ OutputFile="..\Build\MergeDebug\ShellExtension.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
ModuleDefinitionFile=".\ShellExtension.def"
- ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/ShellExtension.pdb"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__Debug/ShellExtension.pdb"
SubSystem="2"
- ImportLibrary=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/ShellExtension.lib"
- TargetMachine="17"
+ ImportLibrary=".\..\BuildTmp\ShellExtension__Debug/ShellExtension.lib"
+ TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
@@ -1056,13 +1056,12 @@
/>
</Configuration>
<Configuration
- Name="Release MinSize|x64"
+ Name="Debug|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
- UseOfATL="2"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
>
@@ -1071,6 +1070,9 @@
/>
<Tool
Name="VCCustomBuildTool"
+ Description="Performing registration"
+ CommandLine="regsvr32 /s /c "$(TargetPath)"
echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg"
"
+ Outputs="$(OutDir)\regsvr32.trg"
/>
<Tool
Name="VCXMLDataGeneratorTool"
@@ -1081,26 +1083,24 @@
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
- TypeLibraryName=".\..\BuildTmp\ShellExtension__ReleaseMinSize/ShellExtension.tlb"
+ TypeLibraryName=".\..\BuildTmp\ShellExtension__Debug/ShellExtension.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions="/D "NDEBUG""
- Optimization="1"
- InlineFunctionExpansion="1"
+ Optimization="0"
AdditionalIncludeDirectories=".,../src/common"
- PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;_ATL_NO_UUIDOF"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_ATL_NO_UUIDOF"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
UsePrecompiledHeader="0"
- PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__ReleaseMinSize/ShellExtension.pch"
- AssemblerListingLocation=".\..\BuildTmp\ShellExtension__ReleaseMinSize/"
- ObjectFile=".\..\BuildTmp\ShellExtension__ReleaseMinSize/"
- ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__ReleaseMinSize/"
+ PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__Debug/ShellExtension.pch"
+ AssemblerListingLocation=".\..\BuildTmp\ShellExtension__Debug/"
+ ObjectFile=".\..\BuildTmp\ShellExtension__Debug/"
+ ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__Debug/"
WarningLevel="3"
SuppressStartupBanner="true"
+ DebugInformationFormat="3"
CompileAs="0"
/>
<Tool
@@ -1108,7 +1108,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="_DEBUG"
Culture="1033"
/>
<Tool
@@ -1116,13 +1116,14 @@
/>
<Tool
Name="VCLinkerTool"
- OutputFile="..\Build\MergeRelease\ShellExtension.dll"
+ OutputFile="..\Build\MergeDebug\ShellExtension.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
ModuleDefinitionFile=".\ShellExtension.def"
- ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__ReleaseMinSize/ShellExtension.pdb"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__Debug/ShellExtension.pdb"
SubSystem="2"
- ImportLibrary=".\..\BuildTmp\ShellExtension__ReleaseMinSize/ShellExtension.lib"
+ ImportLibrary=".\..\BuildTmp\ShellExtension__Debug/ShellExtension.lib"
TargetMachine="17"
/>
<Tool
@@ -1151,14 +1152,14 @@
/>
</Configuration>
<Configuration
- Name="Debug|x64"
- OutputDirectory="$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ Name="X64 Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
+ CharacterSet="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -1166,7 +1167,7 @@
<Tool
Name="VCCustomBuildTool"
Description="Performing registration"
- CommandLine="regsvr32 /s /c "$(TargetPath)"
echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg"
"
+ CommandLine="if "%OS%"=="" goto NOTNT
if not "%OS%"=="Windows_NT" goto NOTNT
regsvr32 /s /c "$(TargetPath)"
echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg"
goto end
:NOTNT
echo Warning : Cannot register Unicode DLL on Windows 95
:end
"
Outputs="$(OutDir)\regsvr32.trg"
/>
<Tool
@@ -1177,25 +1178,24 @@
/>
<Tool
Name="VCMIDLTool"
- TargetEnvironment="3"
- TypeLibraryName=".\..\BuildTmp\ShellExtension__Debug/ShellExtension.tlb"
+ TypeLibraryName=".\..\BuildTmp\ShellExtension__UnicodeDebug/ShellExtension.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=".,../src/common"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_ATL_NO_UUIDOF"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_ATL_NO_UUIDOF"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
- PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__Debug/ShellExtension.pch"
- AssemblerListingLocation=".\..\BuildTmp\ShellExtension__Debug/"
- ObjectFile=".\..\BuildTmp\ShellExtension__Debug/"
- ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__Debug/"
+ PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__UnicodeDebug/ShellExtension.pch"
+ AssemblerListingLocation=".\..\BuildTmp\ShellExtension__UnicodeDebug/"
+ ObjectFile=".\..\BuildTmp\ShellExtension__UnicodeDebug/"
+ ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__UnicodeDebug/"
WarningLevel="3"
SuppressStartupBanner="true"
- DebugInformationFormat="3"
+ DebugInformationFormat="4"
CompileAs="0"
/>
<Tool
@@ -1211,15 +1211,15 @@
/>
<Tool
Name="VCLinkerTool"
- OutputFile="..\Build\MergeDebug\ShellExtension.dll"
+ OutputFile="..\Build\MergeUnicodeDebug\ShellExtensionU.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
- ModuleDefinitionFile=".\ShellExtension.def"
+ ModuleDefinitionFile=".\ShellExtensionU.def"
GenerateDebugInformation="true"
- ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__Debug/ShellExtension.pdb"
+ ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__UnicodeDebug/ShellExtensionU.pdb"
SubSystem="2"
- ImportLibrary=".\..\BuildTmp\ShellExtension__Debug/ShellExtension.lib"
- TargetMachine="17"
+ ImportLibrary=".\..\BuildTmp\ShellExtension__UnicodeDebug/ShellExtensionU.lib"
+ TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
@@ -1248,8 +1248,8 @@
</Configuration>
<Configuration
Name="X64 Debug|x64"
- OutputDirectory="..\Build\$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="..\BuildTmp\$(PlatformName)\$(ConfigurationName)"
+ OutputDirectory="..\Build\ShellExtension\$(ConfigurationName)"
+ IntermediateDirectory="..\BuildTmp\ShellExtension\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
@@ -1437,8 +1437,8 @@
</Configuration>
<Configuration
Name="X64 Release|x64"
- OutputDirectory="..\Build\$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="..\BuildTmp\$(PlatformName)\$(ConfigurationName)"
+ OutputDirectory="..\Build\ShellExtension\$(ConfigurationName)"
+ IntermediateDirectory="..\BuildTmp\ShellExtension\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
@@ -1552,126 +1552,126 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Unicode Release MinSize|Win32"
+ Name="Unicode Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
- Optimization="1"
+ Optimization="0"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_NO_UUIDOF;$(NoInherit)"
+ BasicRuntimeChecks="3"
/>
</FileConfiguration>
<FileConfiguration
- Name="Unicode Release MinDependency|Win32"
+ Name="Unicode Release MinSize|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
- Name="Release MinDependency|Win32"
+ Name="Unicode Release MinSize|x64"
>
<Tool
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
- Name="Release MinSize|Win32"
+ Name="Unicode Release MinDependency|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug|Win32"
+ Name="Unicode Release MinDependency|x64"
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
+ Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_NO_UUIDOF;$(NoInherit)"
- BasicRuntimeChecks="3"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
- Name="X64 Debug|Win32"
+ Name="Release MinDependency|Win32"
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
+ Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_NO_UUIDOF;$(NoInherit)"
- BasicRuntimeChecks="3"
+ PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
- Name="Unicode Debug|x64"
+ Name="Release MinDependency|x64"
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
+ Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_NO_UUIDOF;$(NoInherit)"
- BasicRuntimeChecks="3"
+ PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
- Name="Unicode Release MinSize|x64"
+ Name="Release MinSize|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
+ PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
- Name="Unicode Release MinDependency|x64"
+ Name="Release MinSize|x64"
>
<Tool
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
+ PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
- Name="Release MinDependency|x64"
+ Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
- Optimization="1"
+ Optimization="0"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_NO_UUIDOF;$(NoInherit)"
+ BasicRuntimeChecks="3"
/>
</FileConfiguration>
<FileConfiguration
- Name="Release MinSize|x64"
+ Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
- Optimization="1"
+ Optimization="0"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_NO_UUIDOF;$(NoInherit)"
+ BasicRuntimeChecks="3"
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug|x64"
+ Name="X64 Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_NO_UUIDOF;$(NoInherit)"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_NO_UUIDOF;$(NoInherit)"
BasicRuntimeChecks="3"
/>
</FileConfiguration>
@@ -1722,126 +1722,126 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Unicode Release MinSize|Win32"
+ Name="Unicode Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
- Optimization="1"
+ Optimization="0"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_NO_UUIDOF;$(NoInherit)"
+ BasicRuntimeChecks="3"
/>
</FileConfiguration>
<FileConfiguration
- Name="Unicode Release MinDependency|Win32"
+ Name="Unicode Release MinSize|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
- Name="Release MinDependency|Win32"
+ Name="Unicode Release MinSize|x64"
>
<Tool
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
- Name="Release MinSize|Win32"
+ Name="Unicode Release MinDependency|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug|Win32"
+ Name="Unicode Release MinDependency|x64"
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
+ Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_NO_UUIDOF;$(NoInherit)"
- BasicRuntimeChecks="3"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
- Name="X64 Debug|Win32"
+ Name="Release MinDependency|Win32"
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
+ Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_NO_UUIDOF;$(NoInherit)"
- BasicRuntimeChecks="3"
+ PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
- Name="Unicode Debug|x64"
+ Name="Release MinDependency|x64"
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
+ Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_NO_UUIDOF;$(NoInherit)"
- BasicRuntimeChecks="3"
+ PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
- Name="Unicode Release MinSize|x64"
+ Name="Release MinSize|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
+ PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
- Name="Unicode Release MinDependency|x64"
+ Name="Release MinSize|x64"
>
<Tool
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
+ PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
- Name="Release MinDependency|x64"
+ Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
- Optimization="1"
+ Optimization="0"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_NO_UUIDOF;$(NoInherit)"
+ BasicRuntimeChecks="3"
/>
</FileConfiguration>
<FileConfiguration
- Name="Release MinSize|x64"
+ Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
- Optimization="1"
+ Optimization="0"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_NO_UUIDOF;$(NoInherit)"
+ BasicRuntimeChecks="3"
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug|x64"
+ Name="X64 Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_NO_UUIDOF;$(NoInherit)"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_NO_UUIDOF;$(NoInherit)"
BasicRuntimeChecks="3"
/>
</FileConfiguration>
@@ -1892,126 +1892,126 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Unicode Release MinSize|Win32"
+ Name="Unicode Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
- Optimization="1"
+ Optimization="0"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_NO_UUIDOF;$(NoInherit)"
+ BasicRuntimeChecks="3"
/>
</FileConfiguration>
<FileConfiguration
- Name="Unicode Release MinDependency|Win32"
+ Name="Unicode Release MinSize|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
- Name="Release MinDependency|Win32"
+ Name="Unicode Release MinSize|x64"
>
<Tool
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
- Name="Release MinSize|Win32"
+ Name="Unicode Release MinDependency|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug|Win32"
+ Name="Unicode Release MinDependency|x64"
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
+ Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_NO_UUIDOF;$(NoInherit)"
- BasicRuntimeChecks="3"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
- Name="X64 Debug|Win32"
+ Name="Release MinDependency|Win32"
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
+ Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_NO_UUIDOF;$(NoInherit)"
- BasicRuntimeChecks="3"
+ PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
- Name="Unicode Debug|x64"
+ Name="Release MinDependency|x64"
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
+ Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_NO_UUIDOF;$(NoInherit)"
- BasicRuntimeChecks="3"
+ PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
- Name="Unicode Release MinSize|x64"
+ Name="Release MinSize|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
+ PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
- Name="Unicode Release MinDependency|x64"
+ Name="Release MinSize|x64"
>
<Tool
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
+ PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
- Name="Release MinDependency|x64"
+ Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
- Optimization="1"
+ Optimization="0"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_NO_UUIDOF;$(NoInherit)"
+ BasicRuntimeChecks="3"
/>
</FileConfiguration>
<FileConfiguration
- Name="Release MinSize|x64"
+ Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
- Optimization="1"
+ Optimization="0"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_NO_UUIDOF;$(NoInherit)"
+ BasicRuntimeChecks="3"
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug|x64"
+ Name="X64 Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_NO_UUIDOF;$(NoInherit)"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_NO_UUIDOF;$(NoInherit)"
BasicRuntimeChecks="3"
/>
</FileConfiguration>
@@ -2059,7 +2059,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Unicode Release MinSize|Win32"
+ Name="Unicode Debug|x64"
ExcludedFromBuild="true"
>
<Tool
@@ -2067,7 +2067,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Unicode Release MinDependency|Win32"
+ Name="Unicode Release MinSize|Win32"
ExcludedFromBuild="true"
>
<Tool
@@ -2075,7 +2075,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="X64 Debug|Win32"
+ Name="Unicode Release MinSize|x64"
ExcludedFromBuild="true"
>
<Tool
@@ -2083,7 +2083,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Unicode Debug|x64"
+ Name="Unicode Release MinDependency|Win32"
ExcludedFromBuild="true"
>
<Tool
@@ -2091,7 +2091,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Unicode Release MinSize|x64"
+ Name="Unicode Release MinDependency|x64"
ExcludedFromBuild="true"
>
<Tool
@@ -2099,7 +2099,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Unicode Release MinDependency|x64"
+ Name="X64 Debug|Win32"
ExcludedFromBuild="true"
>
<Tool
@@ -2146,7 +2146,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Unicode Release MinSize|Win32"
+ Name="Unicode Debug|x64"
>
<Tool
Name="VCMIDLTool"
@@ -2157,7 +2157,7 @@
/>
</FileConfiguration>
<FileConfi...
[truncated message content] |
|
From: <ki...@us...> - 2010-01-11 20:45:35
|
Revision: 7092
http://winmerge.svn.sourceforge.net/winmerge/?rev=7092&view=rev
Author: kimmov
Date: 2010-01-11 20:45:25 +0000 (Mon, 11 Jan 2010)
Log Message:
-----------
Fix buildpaths in the SCEW project.
Modified Paths:
--------------
trunk/Externals/scew/win32/scew.vcproj
Modified: trunk/Externals/scew/win32/scew.vcproj
===================================================================
--- trunk/Externals/scew/win32/scew.vcproj 2010-01-11 20:27:43 UTC (rev 7091)
+++ trunk/Externals/scew/win32/scew.vcproj 2010-01-11 20:45:25 UTC (rev 7092)
@@ -47,10 +47,10 @@
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
- PrecompiledHeaderFile=".\..\..\..\BuildTmp\scew\Release/scew.pch"
- AssemblerListingLocation=".\..\..\..\BuildTmp\scew\Release/"
- ObjectFile=".\..\..\..\BuildTmp\scew\Release/"
- ProgramDataBaseFileName=".\..\..\..\BuildTmp\scew\Release/"
+ PrecompiledHeaderFile="$(IntDir)\scew.pch"
+ AssemblerListingLocation="$(OutDir)\Release\"
+ ObjectFile="$(IntDir)\"
+ ProgramDataBaseFileName="$(IntDir)\"
WarningLevel="4"
SuppressStartupBanner="true"
CompileAs="0"
@@ -68,7 +68,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\Build\scew\scew.lib"
+ OutputFile="$(OutDir)\..\scew.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -531,7 +531,7 @@
<Configuration
Name="Debug|Win32"
OutputDirectory=".\..\..\..\Build\scew\Debug"
- IntermediateDirectory=".\..\..\..\Build\scew\Debug"
+ IntermediateDirectory=".\..\..\..\BuildTmp\scew\Debug"
ConfigurationType="4"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
@@ -560,10 +560,10 @@
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
- PrecompiledHeaderFile=".\..\..\..\Build\scew\Debug/scew.pch"
- AssemblerListingLocation=".\..\..\..\Build\scew\Debug/"
- ObjectFile=".\..\..\..\Build\scew\Debug/"
- ProgramDataBaseFileName=".\..\..\..\Build\scew\Debug/"
+ PrecompiledHeaderFile="$(IntDir)\scew.pch"
+ AssemblerListingLocation=".\..\..\..\Build\scew\Debug\"
+ ObjectFile="$(IntDir)\"
+ ProgramDataBaseFileName="$(IntDir)\"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="4"
@@ -582,7 +582,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\Build\scew\scew_d.lib"
+ OutputFile="$(OutDir)\..\scew_d.lib"
SuppressStartupBanner="true"
/>
<Tool
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2010-01-11 20:27:54
|
Revision: 7091
http://winmerge.svn.sourceforge.net/winmerge/?rev=7091&view=rev
Author: kimmov
Date: 2010-01-11 20:27:43 +0000 (Mon, 11 Jan 2010)
Log Message:
-----------
Cleanup. Remove unused return value from method.
Modified Paths:
--------------
trunk/Src/DiffWrapper.cpp
trunk/Src/DiffWrapper.h
Modified: trunk/Src/DiffWrapper.cpp
===================================================================
--- trunk/Src/DiffWrapper.cpp 2010-01-11 19:48:26 UTC (rev 7090)
+++ trunk/Src/DiffWrapper.cpp 2010-01-11 20:27:43 UTC (rev 7091)
@@ -982,13 +982,14 @@
}
/**
- * @brief Enables/disables patch-file appending (files with same filename are appended)
+ * @brief Enables/disables patch-file appending.
+ * If the file for patch already exists then the patch will be appended to
+ * existing file.
+ * @param [in] bAppendFiles If TRUE patch will be appended to existing file.
*/
-BOOL CDiffWrapper::SetAppendFiles(BOOL bAppendFiles)
+void CDiffWrapper::SetAppendFiles(BOOL bAppendFiles)
{
- BOOL temp = m_bAppendFiles;
m_bAppendFiles = bAppendFiles;
- return temp;
}
/**
Modified: trunk/Src/DiffWrapper.h
===================================================================
--- trunk/Src/DiffWrapper.h 2010-01-11 19:48:26 UTC (rev 7090)
+++ trunk/Src/DiffWrapper.h 2010-01-11 20:27:43 UTC (rev 7091)
@@ -157,7 +157,7 @@
void SetPatchOptions(const PATCHOPTIONS *options);
void SetDetectMovedBlocks(bool bDetectMovedBlocks);
bool GetDetectMovedBlocks() { return (m_pMovedLines != NULL); }
- BOOL SetAppendFiles(BOOL bAppendFiles);
+ void SetAppendFiles(BOOL bAppendFiles);
void SetPaths(const String &filepath1, const String &filepath2, BOOL tempPaths);
void SetAlternativePaths(const String &altPath1, const String &altPath2);
void SetCodepage(int codepage) { m_codepage = codepage; }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2010-01-11 19:48:33
|
Revision: 7090
http://winmerge.svn.sourceforge.net/winmerge/?rev=7090&view=rev
Author: kimmov
Date: 2010-01-11 19:48:26 +0000 (Mon, 11 Jan 2010)
Log Message:
-----------
PATCH: [ 2929005 ] Quickcompare and EOL
Fixes bug #2210403
Submitted by Matthias Mayer
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/CompareEngines/ByteComparator.cpp
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2010-01-09 18:39:27 UTC (rev 7089)
+++ trunk/Docs/Users/ChangeLog.txt 2010-01-11 19:48:26 UTC (rev 7090)
@@ -16,6 +16,7 @@
Bugfix: File panes become unaligned when last line didn't have
an EOL byte (#2922517)
Bugfix: Automatic rescanning was not disabled everywhere (r7086,r7089)
+ Bugfix: Quick contents compare didn't ignore EOL byte differences (#2929005)
WinMerge 2.13.10 2009-12-21 (r7051)
Visual Studio project files upgraded to VS2005 format (r7045)
Modified: trunk/Src/CompareEngines/ByteComparator.cpp
===================================================================
--- trunk/Src/CompareEngines/ByteComparator.cpp 2010-01-09 18:39:27 UTC (rev 7089)
+++ trunk/Src/CompareEngines/ByteComparator.cpp 2010-01-11 19:48:26 UTC (rev 7090)
@@ -180,6 +180,12 @@
// cycle through buffer data performing actual comparison
while (true)
{
+ // we are at the end on one side?
+ if ((ptr0 == end0) || (ptr1 == end1))
+ {
+ goto need_more;
+ }
+
if (m_ignore_all_space)
{
// Skip over any whitespace on either side
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2010-01-09 18:39:34
|
Revision: 7089
http://winmerge.svn.sourceforge.net/winmerge/?rev=7089&view=rev
Author: kimmov
Date: 2010-01-09 18:39:27 +0000 (Sat, 09 Jan 2010)
Log Message:
-----------
Automatic rescanning was not disabled everywhere.
Add forced rescan after loading documents (spotted by Matthias).
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/MergeDoc.cpp
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2010-01-09 16:40:17 UTC (rev 7088)
+++ trunk/Docs/Users/ChangeLog.txt 2010-01-09 18:39:27 UTC (rev 7089)
@@ -15,7 +15,7 @@
Bugfix: Pane headers not updated after language change (#2923684)
Bugfix: File panes become unaligned when last line didn't have
an EOL byte (#2922517)
- Bugfix: Automatic rescanning was not disabled everywhere (r7086)
+ Bugfix: Automatic rescanning was not disabled everywhere (r7086,r7089)
WinMerge 2.13.10 2009-12-21 (r7051)
Visual Studio project files upgraded to VS2005 format (r7045)
Modified: trunk/Src/MergeDoc.cpp
===================================================================
--- trunk/Src/MergeDoc.cpp 2010-01-09 16:40:17 UTC (rev 7088)
+++ trunk/Src/MergeDoc.cpp 2010-01-09 18:39:27 UTC (rev 7089)
@@ -2274,7 +2274,7 @@
}
BOOL bBinary = FALSE;
- nRescanResult = Rescan(bBinary, bIdentical);
+ nRescanResult = Rescan(bBinary, bIdentical, TRUE);
// Open filed if rescan succeed and files are not binaries
if (nRescanResult == RESCAN_OK)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2010-01-09 16:40:34
|
Revision: 7088
http://winmerge.svn.sourceforge.net/winmerge/?rev=7088&view=rev
Author: kimmov
Date: 2010-01-09 16:40:17 +0000 (Sat, 09 Jan 2010)
Log Message:
-----------
Improve UpgradeProjects.py to cleanup backup/log files after update.
Modified Paths:
--------------
trunk/Tools/Scripts/UpgradeProjects.py
Modified: trunk/Tools/Scripts/UpgradeProjects.py
===================================================================
--- trunk/Tools/Scripts/UpgradeProjects.py 2010-01-09 16:13:30 UTC (rev 7087)
+++ trunk/Tools/Scripts/UpgradeProjects.py 2010-01-09 16:40:17 UTC (rev 7088)
@@ -15,7 +15,7 @@
## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#############################################################################
-# Copyright (c) 2008-2009 Kimmo Varis <ki...@wi...>
+# Copyright (c) 2008-2010 Kimmo Varis <ki...@wi...>
# $Id$
@@ -31,11 +31,12 @@
import subprocess
import sys
+import cleanup_backups
+import fix_manifest
import ToolSettings
-import fix_manifest
# The version of the script
-script_version = 0.3
+script_version = 0.4
# global settings class instance
tools = ToolSettings.ToolSettings()
@@ -58,17 +59,23 @@
sol_file = os.path.join(root_path, solution)
print 'Upgrading VS solution file: ' + sol_file
subprocess.call([vs_binary, sol_file, '/Upgrade'], shell = True)
+ cleanup(sol_file)
for project in projects:
proj_file = os.path.join(root_path, project)
print 'Upgrading project file: ' + proj_file
subprocess.call([vs_binary, proj_file, '/Upgrade'], shell = True)
+ cleanup(proj_file)
def fix_proj_manifests(root_path):
for project in manifest_projects:
proj_file = os.path.join(root_path, project)
fix_manifest.process_project_file(proj_file)
+def cleanup(updatefile):
+ folder = os.path.dirname(updatefile)
+ cleanup_backups.cleanupfolder(folder)
+
def usage():
'''Print script usage information.'''
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2010-01-09 16:13:41
|
Revision: 7087
http://winmerge.svn.sourceforge.net/winmerge/?rev=7087&view=rev
Author: kimmov
Date: 2010-01-09 16:13:30 +0000 (Sat, 09 Jan 2010)
Log Message:
-----------
Add new script to cleanup VS solution/project update backups/logs.
Added Paths:
-----------
trunk/Tools/Scripts/cleanup_backups.py
Added: trunk/Tools/Scripts/cleanup_backups.py
===================================================================
--- trunk/Tools/Scripts/cleanup_backups.py (rev 0)
+++ trunk/Tools/Scripts/cleanup_backups.py 2010-01-09 16:13:30 UTC (rev 7087)
@@ -0,0 +1,91 @@
+#############################################################################
+## License (GPLv2+):
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful, but
+## WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+## General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#############################################################################
+
+# Copyright (c) 2010 Kimmo Varis <ki...@wi...>
+
+# $Id$
+
+# A script for cleaning up Visual Studio backup files that get created when
+# solution/project files are updated to new version of VS.
+
+import getopt
+import os
+import shutil
+import sys
+
+# The version of the script
+scriptversion = 0.1
+
+def cleanupfolder(folder):
+ reportfolder = os.path.join(folder, r'_UpgradeReport_Files')
+ if os.path.exists(reportfolder):
+ shutil.rmtree(reportfolder)
+
+ logfile = r'UpgradeLog{0}.XML'
+ logfile = os.path.join(folder, logfile.format(''))
+ if os.path.exists(logfile):
+ os.remove(logfile)
+
+ index = 2;
+ existed = True
+ while existed == True:
+ logfile = os.path.join(folder, logfile.format(index))
+ if os.path.exists(logfile):
+ os.remove(logfile)
+ else:
+ existed = False
+ index += 1
+
+def usage():
+ '''Print script usage information.'''
+
+ print 'cleanup_backups.py - version ' + str(scriptversion)
+ print 'Script to cleanup VS solution/project update backup/log files.'
+ print 'Usage: cleanup_backups.py [-h] [path]'
+ print 'Where:'
+ print ' -h, --help Print this help.'
+ print ' path folder where solution/project file is.'
+ print 'For example: cleanup_backups.py src'
+
+def main(argv):
+ rootfolder = ''
+ if len(argv) > 0:
+ opts, args = getopt.getopt(argv, 'h', ['help'])
+
+ for opt, arg in opts:
+ if opt in ('-h', '--help'):
+ usage()
+ sys.exit()
+
+ if len(args) == 1:
+ rel_path = args[0]
+ rootfolder = os.path.abspath(rel_path)
+
+ # If not root path given, use current folder as root path
+ if rootfolder == '':
+ rootfolder = os.getcwd()
+
+ if not os.path.exists(rootfolder):
+ print 'ERROR: Cannot find path: ' + rootfolder
+ sys.exit()
+
+ print 'Removing backups from folder: ' + rootfolder
+ cleanupfolder(rootfolder)
+
+# MAIN #
+if __name__ == "__main__":
+ main(sys.argv[1:])
Property changes on: trunk/Tools/Scripts/cleanup_backups.py
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2010-01-09 13:38:31
|
Revision: 7086
http://winmerge.svn.sourceforge.net/winmerge/?rev=7086&view=rev
Author: kimmov
Date: 2010-01-09 13:38:25 +0000 (Sat, 09 Jan 2010)
Log Message:
-----------
Automatic rescanning was not disabled everywhere.
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/MergeDoc.h
trunk/Src/MergeEditView.cpp
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2010-01-09 13:30:38 UTC (rev 7085)
+++ trunk/Docs/Users/ChangeLog.txt 2010-01-09 13:38:25 UTC (rev 7086)
@@ -15,6 +15,7 @@
Bugfix: Pane headers not updated after language change (#2923684)
Bugfix: File panes become unaligned when last line didn't have
an EOL byte (#2922517)
+ Bugfix: Automatic rescanning was not disabled everywhere (r7086)
WinMerge 2.13.10 2009-12-21 (r7051)
Visual Studio project files upgraded to VS2005 format (r7045)
Modified: trunk/Src/MergeDoc.h
===================================================================
--- trunk/Src/MergeDoc.h 2010-01-09 13:30:38 UTC (rev 7085)
+++ trunk/Src/MergeDoc.h 2010-01-09 13:38:25 UTC (rev 7086)
@@ -234,6 +234,7 @@
void SetMergingMode(bool bMergingMode);
void SetDetectMovedBlocks(bool bDetectMovedBlocks);
bool IsMixedEOL(int nBuffer) const;
+ void SetAutomaticRescan(bool bRescan) { m_bEnableRescan = bRescan; }
// implementation methods
private:
Modified: trunk/Src/MergeEditView.cpp
===================================================================
--- trunk/Src/MergeEditView.cpp 2010-01-09 13:30:38 UTC (rev 7085)
+++ trunk/Src/MergeEditView.cpp 2010-01-09 13:38:25 UTC (rev 7086)
@@ -1635,6 +1635,7 @@
{
bool bOldValue = m_bAutomaticRescan;
m_bAutomaticRescan = bEnable;
+ GetDocument()->SetAutomaticRescan(m_bAutomaticRescan);
return bOldValue;
}
@@ -2340,6 +2341,7 @@
void CMergeEditView::RefreshOptions()
{
m_bAutomaticRescan = GetOptionsMgr()->GetBool(OPT_AUTOMATIC_RESCAN);
+ GetDocument()->SetAutomaticRescan(m_bAutomaticRescan);
if (GetOptionsMgr()->GetInt(OPT_TAB_TYPE) == 0)
SetInsertTabs(true);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2010-01-09 13:30:47
|
Revision: 7085
http://winmerge.svn.sourceforge.net/winmerge/?rev=7085&view=rev
Author: kimmov
Date: 2010-01-09 13:30:38 +0000 (Sat, 09 Jan 2010)
Log Message:
-----------
Update project upgrade scrip after PCRE update.
Modified Paths:
--------------
trunk/Tools/Scripts/UpgradeProjects.py
Modified: trunk/Tools/Scripts/UpgradeProjects.py
===================================================================
--- trunk/Tools/Scripts/UpgradeProjects.py 2010-01-08 21:40:43 UTC (rev 7084)
+++ trunk/Tools/Scripts/UpgradeProjects.py 2010-01-09 13:30:38 UTC (rev 7085)
@@ -41,12 +41,12 @@
tools = ToolSettings.ToolSettings()
solutions = [r'Externals\expat\expat.sln',
- r'Externals\pcre\Win32\PCRE.sln',
r'WinMerge.sln']
projects = [r'Externals\scew\win32\scew.vcproj',
+ r'Externals\pcre\Win32\pcre.vcproj',
r'ShellExtension\ShellExtension.vcproj']
-
+
# These projects need the manifest file fix
manifest_projects = [r'Src\Merge.vcproj']
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2010-01-08 21:40:58
|
Revision: 7084
http://winmerge.svn.sourceforge.net/winmerge/?rev=7084&view=rev
Author: kimmov
Date: 2010-01-08 21:40:43 +0000 (Fri, 08 Jan 2010)
Log Message:
-----------
Link against scew[_d].lib.
This solves linking problems after SCEW update.
Modified Paths:
--------------
trunk/Src/Merge.vcproj
Modified: trunk/Src/Merge.vcproj
===================================================================
--- trunk/Src/Merge.vcproj 2010-01-08 19:49:11 UTC (rev 7083)
+++ trunk/Src/Merge.vcproj 2010-01-08 21:40:43 UTC (rev 7084)
@@ -1,11192 +1,12040 @@
-<?xml version="1.0" ?>
-<VisualStudioProject Keyword="MFCProj" Name="Merge" ProjectGUID="{2A81DB64-C062-48AF-8D2E-23B68320142D}" ProjectType="Visual C++" Version="8.00">
-
-
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="Merge"
+ ProjectGUID="{2A81DB64-C062-48AF-8D2E-23B68320142D}"
+ Keyword="MFCProj"
+ >
<Platforms>
-
-
- <Platform Name="Win32"/>
-
-
+ <Platform
+ Name="Win32"
+ />
</Platforms>
-
-
<ToolFiles>
-
-
</ToolFiles>
-
-
<Configurations>
-
-
- <Configuration ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="1" ConfigurationType="1" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" IntermediateDirectory=".\..\BuildTmp\MergeUnicodeRelease" Name="UnicodeRelease|Win32" OutputDirectory=".\..\BuildTmp\MergeUnicodeRelease" UseOfMFC="2">
-
-
- <Tool Name="VCPreBuildEventTool"/>
-
-
- <Tool Name="VCCustomBuildTool"/>
-
-
- <Tool Name="VCXMLDataGeneratorTool"/>
-
-
- <Tool Name="VCWebServiceProxyGeneratorTool"/>
-
-
- <Tool HeaderFileName="" MkTypLibCompatible="true" Name="VCMIDLTool" PreprocessorDefinitions="NDEBUG" SuppressStartupBanner="true" TargetEnvironment="1" TypeLibraryName=".\..\BuildTmp\MergeUnicodeRelease/Merge.tlb"/>
-
-
- <Tool AdditionalIncludeDirectories=".;.\CompareEngines;.\Common;.\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\expat\lib;..\Externals\expat\xmlwf;..\Externals\scew;..\Externals\pcre\Win32" AdditionalOptions="/EHa " AssemblerListingLocation=".\..\BuildTmp\MergeUnicodeRelease/" CompileAs="0" DebugInformationFormat="0" EnableFunctionLevelLinking="true" InlineFunctionExpansion="1" Name="VCCLCompilerTool" ObjectFile=".\..\BuildTmp\MergeUnicodeRelease/" Optimization="1" PrecompiledHeaderFile=".\..\BuildTmp\MergeUnicodeRelease/Merge.pch" PrecompiledHeaderThrough="stdafx.h" PreprocessorDefinitions="WIN32;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_CRT_SECURE_NO_DEPRECATE" ProgramDataBaseFileName=".\..\BuildTmp\MergeUnicodeRelease/" RuntimeLibrary="2" RuntimeTypeInfo="true" StringPooling="true" SuppressStartupBanner="true" UsePrecompiledHeader="2" WarningLevel="3"/>
-
-
- <Tool Name="VCManagedResourceCompilerTool"/>
-
-
- <Tool Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG"/>
-
-
- <Tool CommandLine="PreLink.bat $(IntDir) $(TargetPath)" Name="VCPreLinkEventTool"/>
-
-
- <Tool AdditionalDependencies="version.lib shlwapi.lib imm32.lib HtmlHelp.lib libexpat.lib pcre.lib" AdditionalLibraryDirectories="..\Build\expat,..\Build\pcre,..\Build\scew" AdditionalOptions="/verbose:lib" EntryPointSymbol="wWinMainCRTStartup" GenerateDebugInformation="false" IgnoreDefaultLibraryNames="" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\Build\MergeUnicodeRelease\WinMergeU.exe" ProgramDatabaseFile="" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/>
-
-
- <Tool Name="VCALinkTool"/>
-
-
- <Tool AdditionalManifestFiles="$(InputDir)\res\$(TargetFileName).manifest" EmbedManifest="true" Name="VCManifestTool"/>
-
-
- <Tool Name="VCXDCMakeTool"/>
-
-
- <Tool Name="VCBscMakeTool"/>
-
-
- <Tool Name="VCFxCopTool"/>
-
-
- <Tool Name="VCAppVerifierTool"/>
-
-
- <Tool Name="VCWebDeploymentTool"/>
-
-
- <Tool CommandLine="PostBuild.bat $(IntDir) $(TargetPath)" Name="VCPostBuildEventTool"/>
-
-
+ <Configuration
+ Name="UnicodeRelease|Win32"
+ OutputDirectory=".\..\BuildTmp\MergeUnicodeRelease"
+ IntermediateDirectory=".\..\BuildTmp\MergeUnicodeRelease"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="2"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="NDEBUG"
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="1"
+ TypeLibraryName=".\..\BuildTmp\MergeUnicodeRelease/Merge.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/EHa "
+ Optimization="1"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories=".;.\CompareEngines;.\Common;.\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\expat\lib;..\Externals\expat\xmlwf;..\Externals\scew;..\Externals\pcre\Win32"
+ PreprocessorDefinitions="WIN32;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_CRT_SECURE_NO_DEPRECATE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ RuntimeTypeInfo="true"
+ UsePrecompiledHeader="2"
+ PrecompiledHeaderThrough="stdafx.h"
+ PrecompiledHeaderFile=".\..\BuildTmp\MergeUnicodeRelease/Merge.pch"
+ AssemblerListingLocation=".\..\BuildTmp\MergeUnicodeRelease/"
+ ObjectFile=".\..\BuildTmp\MergeUnicodeRelease/"
+ ProgramDataBaseFileName=".\..\BuildTmp\MergeUnicodeRelease/"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ CommandLine="PreLink.bat $(IntDir) $(TargetPath)"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/verbose:lib"
+ AdditionalDependencies="version.lib shlwapi.lib imm32.lib HtmlHelp.lib scew.lib libexpat.lib pcre.lib"
+ OutputFile="..\Build\MergeUnicodeRelease\WinMergeU.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="..\Build\expat,..\Build\pcre,..\Build\scew"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="false"
+ ProgramDatabaseFile=""
+ SubSystem="2"
+ EntryPointSymbol="wWinMainCRTStartup"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ AdditionalManifestFiles="$(InputDir)\res\$(TargetFileName).manifest"
+ EmbedManifest="true"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine="PostBuild.bat $(IntDir) $(TargetPath)"
+ />
</Configuration>
-
-
- <Configuration ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="1" ConfigurationType="1" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" IntermediateDirectory=".\..\BuildTmp\MergeUnicodeDebug" Name="UnicodeDebug|Win32" OutputDirectory=".\..\BuildTmp\MergeUnicodeDebug" UseOfMFC="2">
-
-
- <Tool Name="VCPreBuildEventTool"/>
-
-
- <Tool Name="VCCustomBuildTool"/>
-
-
- <Tool Name="VCXMLDataGeneratorTool"/>
-
-
- <Tool Name="VCWebServiceProxyGeneratorTool"/>
-
-
- <Tool HeaderFileName="" MkTypLibCompatible="true" Name="VCMIDLTool" PreprocessorDefinitions="_DEBUG" SuppressStartupBanner="true" TargetEnvironment="1" TypeLibraryName=".\..\BuildTmp\MergeUnicodeDebug/Merge.tlb"/>
-
-
- <Tool AdditionalIncludeDirectories=".;.\CompareEngines;.\Common;.\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\expat\lib;..\Externals\expat\xmlwf;..\Externals\scew;..\Externals\pcre\Win32" AdditionalOptions="/EHa " AssemblerListingLocation=".\..\BuildTmp\MergeUnicodeDebug/" BrowseInformation="1" CompileAs="0" DebugInformationFormat="3" Name="VCCLCompilerTool" ObjectFile=".\..\BuildTmp\MergeUnicodeDebug/" Optimization="0" PrecompiledHeaderFile=".\..\BuildTmp\MergeUnicodeDebug/Merge.pch" PrecompiledHeaderThrough="stdafx.h" PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_CRT_SECURE_NO_DEPRECATE" ProgramDataBaseFileName=".\..\BuildTmp\MergeUnicodeDebug/" RuntimeLibrary="3" RuntimeTypeInfo="true" SuppressStartupBanner="true" UsePrecompiledHeader="2" WarningLevel="3"/>
-
-
- <Tool Name="VCManagedResourceCompilerTool"/>
-
-
- <Tool Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG"/>
-
-
- <Tool CommandLine="PreLink.bat $(IntDir) $(TargetPath)" Name="VCPreLinkEventTool"/>
-
-
- <Tool AdditionalDependencies="version.lib shlwapi.lib imm32.lib HtmlHelp.lib libexpat.lib pcre.lib" AdditionalLibraryDirectories="..\Build\expat,..\Build\pcre,..\Build\scew" EntryPointSymbol="wWinMainCRTStartup" GenerateDebugInformation="true" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\Build\MergeUnicodeDebug/WinMergeU.exe" ProgramDatabaseFile=".\..\BuildTmp\MergeUnicodeDebug/WinMergeU.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/>
-
-
- <Tool Name="VCALinkTool"/>
-
-
- <Tool AdditionalManifestFiles="$(InputDir)\res\$(TargetFileName).manifest" EmbedManifest="true" Name="VCManifestTool"/>
-
-
- <Tool Name="VCXDCMakeTool"/>
-
-
- <Tool Name="VCBscMakeTool"/>
-
-
- <Tool Name="VCFxCopTool"/>
-
-
- <Tool Name="VCAppVerifierTool"/>
-
-
- <Tool Name="VCWebDeploymentTool"/>
-
-
- <Tool CommandLine="PostBuild.bat $(IntDir) $(TargetPath)" Name="VCPostBuildEventTool"/>
-
-
+ <Configuration
+ Name="UnicodeDebug|Win32"
+ OutputDirectory=".\..\BuildTmp\MergeUnicodeDebug"
+ IntermediateDirectory=".\..\BuildTmp\MergeUnicodeDebug"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="2"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="_DEBUG"
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="1"
+ TypeLibraryName=".\..\BuildTmp\MergeUnicodeDebug/Merge.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/EHa "
+ Optimization="0"
+ AdditionalIncludeDirectories=".;.\CompareEngines;.\Common;.\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\expat\lib;..\Externals\expat\xmlwf;..\Externals\scew;..\Externals\pcre\Win32"
+ PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_CRT_SECURE_NO_DEPRECATE"
+ RuntimeLibrary="3"
+ RuntimeTypeInfo="true"
+ UsePrecompiledHeader="2"
+ PrecompiledHeaderThrough="stdafx.h"
+ PrecompiledHeaderFile=".\..\BuildTmp\MergeUnicodeDebug/Merge.pch"
+ AssemblerListingLocation=".\..\BuildTmp\MergeUnicodeDebug/"
+ ObjectFile=".\..\BuildTmp\MergeUnicodeDebug/"
+ ProgramDataBaseFileName=".\..\BuildTmp\MergeUnicodeDebug/"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ CommandLine="PreLink.bat $(IntDir) $(TargetPath)"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="version.lib shlwapi.lib imm32.lib HtmlHelp.lib scew_d.lib libexpat.lib pcre.lib"
+ OutputFile="..\Build\MergeUnicodeDebug/WinMergeU.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="..\Build\expat,..\Build\pcre,..\Build\scew"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile=".\..\BuildTmp\MergeUnicodeDebug/WinMergeU.pdb"
+ SubSystem="2"
+ EntryPointSymbol="wWinMainCRTStartup"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ AdditionalManifestFiles="$(InputDir)\res\$(TargetFileName).manifest"
+ EmbedManifest="true"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine="PostBuild.bat $(IntDir) $(TargetPath)"
+ />
</Configuration>
-
-
- <Configuration ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" ConfigurationType="1" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" IntermediateDirectory=".\..\BuildTmp\MergeDebug" Name="Debug|Win32" OutputDirectory=".\..\BuildTmp\MergeDebug" UseOfMFC="2">
-
-
- <Tool Name="VCPreBuildEventTool"/>
-
-
- <Tool Name="VCCustomBuildTool"/>
-
-
- <Tool Name="VCXMLDataGeneratorTool"/>
-
-
- <Tool Name="VCWebServiceProxyGeneratorTool"/>
-
-
- <Tool HeaderFileName="" MkTypLibCompatible="true" Name="VCMIDLTool" PreprocessorDefinitions="_DEBUG" SuppressStartupBanner="true" TargetEnvironment="1" TypeLibraryName=".\..\BuildTmp\MergeDebug/Merge.tlb"/>
-
-
- <Tool AdditionalIncludeDirectories=".;.\CompareEngines;.\Common;.\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\expat\lib;..\Externals\expat\xmlwf;..\Externals\scew;..\Externals\pcre\Win32" AdditionalOptions="/EHa " AssemblerListingLocation=".\..\BuildTmp\MergeDebug/" BrowseInformation="1" CompileAs="0" DebugInformationFormat="3" Name="VCCLCompilerTool" ObjectFile=".\..\BuildTmp\MergeDebug/" Optimization="0" PrecompiledHeaderFile=".\..\BuildTmp\MergeDebug/Merge.pch" PrecompiledHeaderThrough="stdafx.h" PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;_CRT_SECURE_NO_DEPRECATE" ProgramDataBaseFileName=".\..\BuildTmp\MergeDebug/" RuntimeLibrary="3" RuntimeTypeInfo="true" SuppressStartupBanner="true" UsePrecompiledHeader="2" WarningLevel="3"/>
-
-
- <Tool Name="VCManagedResourceCompilerTool"/>
-
-
- <Tool Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG"/>
-
-
- <Tool CommandLine="PreLink.bat $(IntDir) $(TargetPath)" Name="VCPreLinkEventTool"/>
-
-
- <Tool AdditionalDependencies="version.lib shlwapi.lib imm32.lib HtmlHelp.lib libexpat.lib pcre.lib" AdditionalLibraryDirectories="..\Build\expat,..\Build\pcre,..\Build\scew" GenerateDebugInformation="true" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\Build\MergeDebug/WinMerge.exe" ProgramDatabaseFile=".\..\BuildTmp\MergeDebug/WinMerge.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/>
-
-
- <Tool Name="VCALinkTool"/>
-
-
- <Tool AdditionalManifestFiles="$(InputDir)\res\$(TargetFileName).manifest" EmbedManifest="true" Name="VCManifestTool"/>
-
-
- <Tool Name="VCXDCMakeTool"/>
-
-
- <Tool Name="VCBscMakeTool"/>
-
-
- <Tool Name="VCFxCopTool"/>
-
-
- <Tool Name="VCAppVerifierTool"/>
-
-
- <Tool Name="VCWebDeploymentTool"/>
-
-
- <Tool CommandLine="PostBuild.bat $(IntDir) $(TargetPath)" Name="VCPostBuildEventTool"/>
-
-
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory=".\..\BuildTmp\MergeDebug"
+ IntermediateDirectory=".\..\BuildTmp\MergeDebug"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="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=".\..\BuildTmp\MergeDebug/Merge.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/EHa "
+ Optimization="0"
+ AdditionalIncludeDirectories=".;.\CompareEngines;.\Common;.\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\expat\lib;..\Externals\expat\xmlwf;..\Externals\scew;..\Externals\pcre\Win32"
+ PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;_CRT_SECURE_NO_DEPRECATE"
+ RuntimeLibrary="3"
+ RuntimeTypeInfo="true"
+ UsePrecompiledHeader="2"
+ PrecompiledHeaderThrough="stdafx.h"
+ PrecompiledHeaderFile=".\..\BuildTmp\MergeDebug/Merge.pch"
+ AssemblerListingLocation=".\..\BuildTmp\MergeDebug/"
+ ObjectFile=".\..\BuildTmp\MergeDebug/"
+ ProgramDataBaseFileName=".\..\BuildTmp\MergeDebug/"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ CommandLine="PreLink.bat $(IntDir) $(TargetPath)"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="version.lib shlwapi.lib imm32.lib HtmlHelp.lib scew_d.lib libexpat.lib pcre.lib"
+ OutputFile="..\Build\MergeDebug/WinMerge.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="..\Build\expat,..\Build\pcre,..\Build\scew"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile=".\..\BuildTmp\MergeDebug/WinMerge.pdb"
+ SubSystem="2"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ AdditionalManifestFiles="$(InputDir)\res\$(TargetFileName).manifest"
+ EmbedManifest="true"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine="PostBuild.bat $(IntDir) $(TargetPath)"
+ />
</Configuration>
-
-
- <Configuration ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" ConfigurationType="1" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" IntermediateDirectory=".\..\BuildTmp\MergeRelease" Name="Release|Win32" OutputDirectory=".\..\BuildTmp\MergeRelease" UseOfMFC="2">
-
-
- <Tool Name="VCPreBuildEventTool"/>
-
-
- <Tool Name="VCCustomBuildTool"/>
-
-
- <Tool Name="VCXMLDataGeneratorTool"/>
-
-
- <Tool Name="VCWebServiceProxyGeneratorTool"/>
-
-
- <Tool HeaderFileName="" MkTypLibCompatible="true" Name="VCMIDLTool" PreprocessorDefinitions="NDEBUG" SuppressStartupBanner="true" TargetEnvironment="1" TypeLibraryName=".\..\BuildTmp\MergeRelease/Merge.tlb"/>
-
-
- <Tool AdditionalIncludeDirectories=".;.\CompareEngines;.\Common;.\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\expat\lib;..\Externals\expat\xmlwf;..\Externals\scew;..\Externals\pcre\Win32" AdditionalOptions="/EHa " AssemblerListingLocation=".\..\BuildTmp\MergeRelease/" CompileAs="0" DebugInformationFormat="0" EnableFunctionLevelLinking="true" InlineFunctionExpansion="1" Name="VCCLCompilerTool" ObjectFile=".\..\BuildTmp\MergeRelease/" Optimization="1" PrecompiledHeaderFile=".\..\BuildTmp\MergeRelease/Merge.pch" PrecompiledHeaderThrough="stdafx.h" PreprocessorDefinitions="WIN32;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;_CRT_SECURE_NO_DEPRECATE" ProgramDataBaseFileName=".\..\BuildTmp\MergeRelease/" RuntimeLibrary="2" RuntimeTypeInfo="true" StringPooling="true" SuppressStartupBanner="true" UsePrecompiledHeader="2" WarningLevel="3"/>
-
-
- <Tool Name="VCManagedResourceCompilerTool"/>
-
-
- <Tool Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG"/>
-
-
- <Tool CommandLine="PreLink.bat $(IntDir) $(TargetPath)" Name="VCPreLinkEventTool"/>
-
-
- <Tool AdditionalDependencies="version.lib shlwapi.lib imm32.lib HtmlHelp.lib libexpat.lib pcre.lib" AdditionalLibraryDirectories="..\Build\expat,..\Build\pcre,..\Build\scew" AdditionalOptions="/verbose:lib" GenerateDebugInformation="false" IgnoreDefaultLibraryNames="" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\Build\MergeRelease/WinMerge.exe" ProgramDatabaseFile="" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/>
-
-
- <Tool Name="VCALinkTool"/>
-
-
- <Tool AdditionalManifestFiles="$(InputDir)\res\$(TargetFileName).manifest" EmbedManifest="true" Name="VCManifestTool"/>
-
-
- <Tool Name="VCXDCMakeTool"/>
-
-
- <Tool Name="VCBscMakeTool"/>
-
-
- <Tool Name="VCFxCopTool"/>
-
-
- <Tool Name="VCAppVerifierTool"/>
-
-
- <Tool Name="VCWebDeploymentTool"/>
-
-
- <Tool CommandLine="PostBuild.bat $(IntDir) $(TargetPath)" Name="VCPostBuildEventTool"/>
-
-
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory=".\..\BuildTmp\MergeRelease"
+ IntermediateDirectory=".\..\BuildTmp\MergeRelease"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="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=".\..\BuildTmp\MergeRelease/Merge.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/EHa "
+ Optimization="1"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories=".;.\CompareEngines;.\Common;.\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\expat\lib;..\Externals\expat\xmlwf;..\Externals\scew;..\Externals\pcre\Win32"
+ PreprocessorDefinitions="WIN32;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;_CRT_SECURE_NO_DEPRECATE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ RuntimeTypeInfo="true"
+ UsePrecompiledHeader="2"
+ PrecompiledHeaderThrough="stdafx.h"
+ PrecompiledHeaderFile=".\..\BuildTmp\MergeRelease/Merge.pch"
+ AssemblerListingLocation=".\..\BuildTmp\MergeRelease/"
+ ObjectFile=".\..\BuildTmp\MergeRelease/"
+ ProgramDataBaseFileName=".\..\BuildTmp\MergeRelease/"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ CommandLine="PreLink.bat $(IntDir) $(TargetPath)"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalOptions="/verbose:lib"
+ AdditionalDependencies="version.lib shlwapi.lib imm32.lib HtmlHelp.lib libexpat.lib pcre.lib"
+ OutputFile="..\Build\MergeRelease/WinMerge.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="..\Build\expat,..\Build\pcre,..\Build\scew"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="false"
+ ProgramDatabaseFile=""
+ SubSystem="2"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ AdditionalManifestFiles="$(InputDir)\res\$(TargetFileName).manifest"
+ EmbedManifest="true"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine="PostBuild.bat $(IntDir) $(TargetPath)"
+ />
</Configuration>
-
-
</Configurations>
-
-
<References>
-
-
</References>
-
-
<Files>
-
-
- <Filter Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" Name="Source Files">
-
-
- <File RelativePath="7zCommon.cpp">
-
-
- <FileConfiguration Name="UnicodeRelease|Win32">
-
-
- <Tool AdditionalIncludeDirectories="" Name="VCCLCompilerTool" Optimization="1" PreprocessorDefinitions=""/>
-
-
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="7zCommon.cpp"
+ >
+ <FileConfiguration
+ Name="UnicodeRelease|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
</FileConfiguration>
-
-
- <FileConfiguration Name="UnicodeDebug|Win32">
-
-
- <Tool AdditionalIncludeDirectories="" BrowseInformation="1" Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions=""/>
-
-
+ <FileConfiguration
+ Name="UnicodeDebug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BrowseInformation="1"
+ />
</FileConfiguration>
-
-
- <FileConfiguration Name="Debug|Win32">
-
-
- <Tool AdditionalIncludeDirectories="" BrowseInformation="1" Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions=""/>
-
-
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BrowseInformation="1"
+ />
</FileConfiguration>
-
-
- <FileConfiguration Name="Release|Win32">
-
-
- <Tool AdditionalIncludeDirectories="" Name="VCCLCompilerTool" Optimization="1" PreprocessorDefinitions=""/>
-
-
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
</FileConfiguration>
-
-
</File>
-
-
- <File RelativePath="AboutDlg.cpp">
-
-
- <FileConfiguration Name="UnicodeRelease|Win32">
-
-
- <Tool AdditionalIncludeDirectories="" Name="VCCLCompilerTool" Optimization="1" PreprocessorDefinitions=""/>
-
-
+ <File
+ RelativePath="AboutDlg.cpp"
+ >
+ <FileConfiguration
+ Name="UnicodeRelease|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
</FileConfiguration>
-
-
- <FileConfiguration Name="UnicodeDebug|Win32">
-
-
- <Tool AdditionalIncludeDirectories="" BrowseInformation="1" Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions=""/>
-
-
+ <FileConfiguration
+ Name="UnicodeDebug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BrowseInformation="1"
+ />
</FileConfiguration>
-
-
- <FileConfiguration Name="Debug|Win32">
-
-
- <Tool AdditionalIncludeDirectories="" BrowseInformation="1" Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions=""/>
-
-
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BrowseInformation="1"
+ />
</FileConfiguration>
-
-
- <FileConfiguration Name="Release|Win32">
-
-
- <Tool AdditionalIncludeDirectories="" Name="VCCLCompilerTool" Optimization="1" PreprocessorDefinitions=""/>
-
-
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
</FileConfiguration>
-
-
</File>
-
-
- <File RelativePath=".\AnsiConvert.cpp">
-
-
- <FileConfiguration Name="UnicodeRelease|Win32">
-
-
- <Tool AdditionalIncludeDirectories="" Name="VCCLCompilerTool" Optimization="1" PrecompiledHeaderThrough="" PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" UsePrecompiledHeader="0"/>
-
-
+ <File
+ RelativePath=".\AnsiConvert.cpp"
+ >
+ <FileConfiguration
+ Name="UnicodeRelease|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ />
</FileConfiguration>
-
-
- <FileConfiguration Name="UnicodeDebug|Win32">
-
-
- <Tool AdditionalIncludeDirectories="" BrowseInformation="1" Name="VCCLCompilerTool" Optimization="0" PrecompiledHeaderThrough="" PreprocessorDefinitions="" UsePrecompiledHeader="0"/>
-
-
+ <FileConfiguration
+ Name="UnicodeDebug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ BrowseInformation="1"
+ />
</FileConfiguration>
-
-
- <FileConfiguration Name="Debug|Win32">
-
-
- <Tool AdditionalIncludeDirectories="" BrowseInformation="1" Name="VCCLCompilerTool" Optimization="0" PrecompiledHeaderThrough="" PreprocessorDefinitions="" UsePrecompiledHeader="0"/>
-
-
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ BrowseInformation="1"
+ />
</FileConfiguration>
-
-
- <FileConfiguration Name="Release|Win32">
-
-
- <Tool AdditionalIncludeDirectories="" Name="VCCLCompilerTool" Optimization="1" PrecompiledHeaderThrough="" PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)" UsePrecompiledHeader="0"/>
-
-
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ />
</FileConfiguration>
-
-
</File>
-
-
- <File RelativePath="BCMenu.cpp">
-
-
- <FileConfiguration Name="UnicodeRelease|Win32">
-
-
- <Tool AdditionalIncludeDirectories="" Name="VCCLCompilerTool" Optimization="1" PreprocessorDefinitions=""/>
-
-
+ <File
+ RelativePath="BCMenu.cpp"
+ >
+ <FileConfiguration
+ Name="UnicodeRelease|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
</FileConfiguration>
-
-
- <FileConfiguration Name="UnicodeDebug|Win32">
-
-
- <Tool AdditionalIncludeDirectories="" BrowseInformation="1" Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions=""/>
-
-
+ <FileConfiguration
+ Name="UnicodeDebug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BrowseInformation="1"
+ />
</FileConfiguration>
-
-
- <FileConfiguration Name="Debug|Win32">
-
-
- <Tool AdditionalIncludeDirectories="" BrowseInformation="1" Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions=""/>
-
-
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BrowseInformation="1"
+ />
</FileConfiguration>
-
-
- <FileConfiguration Name="Release|Win32">
-
-
- <Tool AdditionalIncludeDirectories="" Name="VCCLCompilerTool" Optimization="1" PreprocessorDefinitions=""/>
-
-
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
</FileConfiguration>
-
-
</File>
-
-
- <File RelativePath=".\Common\Bitmap.cpp">
-
-
+ <File
+ RelativePath=".\Common\Bitmap.cpp"
+ >
</File>
-
-
- <File RelativePath="CCPrompt.cpp">
-
-
- <FileConfiguration Name="UnicodeRelease|Win32">
-
-
- <Tool AdditionalIncludeDirectories="" Name="VCCLCompilerTool" Optimization="1" PreprocessorDefinitions=""/>
-
-
+ <File
+ RelativePath="CCPrompt.cpp"
+ >
+ <FileConfiguration
+ Name="UnicodeRelease|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
</FileConfiguration>
-
-
- <FileConfiguration Name="UnicodeDebug|Win32">
-
-
- <Tool AdditionalIncludeDirectories="" BrowseInformation="1" Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions=""/>
-
-
+ <FileConfiguration
+ Name="UnicodeDebug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BrowseInformation="1"
+ />
</FileConfiguration>
-
-
- <FileConfiguration Name="Debug|Win32">
-
-
- <Tool AdditionalIncludeDirectories="" BrowseInformation="1" Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions=""/>
-
-
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BrowseInformation="1"
+ />
</FileConfiguration>
-
-
- <FileConfiguration Name="Release|Win32">
-
-
- <Tool AdditionalIncludeDirectories="" Name="VCCLCompilerTool" Optimization="1" PreprocessorDefinitions=""/>
-
-
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
</FileConfiguration>
-
-
</File>
-
-
- <File RelativePath="charsets.c">
-
-
- <FileConfiguration Name="UnicodeRelease|Win32">
-
-
- <Tool AdditionalIncludeDirectories="" Name="VCCLCompilerTool" Optimization="1" PreprocessorDefinitions="" UsePrecompiledHeader="0"/>
-
-
+ <File
+ RelativePath="charsets.c"
+ >
+ <FileConfiguration
+ Name="UnicodeRelease|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ />
</FileConfiguration>
-
-
- <FileConfiguration Name="UnicodeDebug|Win32">
-
-
- <Tool AdditionalIncludeDirectories="" BrowseInformation="1" Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions="" UsePrecompiledHeader="0"/>
-
-
+ <FileConfiguration
+ Name="UnicodeDebug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ />
</FileConfiguration>
-
-
- <FileConfiguration Name="Debug|Win32">
-
-
- <Tool AdditionalIncludeDirectories="" BrowseInformation="1" Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions="" UsePrecompiledHeader="0"/>
-
-
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ />
</FileConfiguration>
-
-
- <FileConfiguration Name="Release|Win32">
-
-
- <Tool AdditionalIncludeDirectories="" Name="VCCLCompilerTool" Optimization="1" PreprocessorDefinitions="" UsePrecompiledHeader="0"/>
-
-
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ />
</FileConfiguration>
-
-
</File>
-
-
- <File RelativePath="ChildFrm.cpp">
-
-
- <FileConfiguration Name="UnicodeRelease|Win32">
-
-
- <Tool AdditionalIncludeDirectories="" Name="VCCLCompilerTool" Optimization="1" PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"/>
-
-
+ <File
+ RelativePath="ChildFrm.cpp"
+ >
+ <FileConfiguration
+ Name="UnicodeRelease|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ />
</FileConfiguration>
-
-
- <FileConfiguration Name="UnicodeDebug|Win32">
-
-
- <Tool AdditionalIncludeDirectories="" BrowseInformation="1" Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions=""/>
-
-
+ <FileConfiguration
+ Name="UnicodeDebug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BrowseInformation="1"
+ />
</FileConfiguration>
-
-
- <FileConfiguration Name="Debug|Win32">
-
-
- <Tool AdditionalIncludeDirectories="" BrowseInformation="1" Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions=""/>
-
-
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BrowseInformation="1"
+ />
</FileConfiguration>
-
-
- <FileConfiguration Name="Release|Win32">
-
-
- <Tool AdditionalIncludeDirectories="" Name="VCCLCompilerTool" Optimization="1" PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"/>
-
-
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"
+ />
</FileConfiguration>
-
-
</File>
-
-
- <File RelativePath="Common\ClipBoard.cpp">
-
-
- <FileConfiguration Name="UnicodeRelease|Win32">
-
-
- <Tool AdditionalIncludeDirectories="" Name="VCCLCompilerTool" Optimization="1" PreprocessorDefinitions=""/>
-
-
+ <File
+ RelativePath="Common\ClipBoard.cpp"
+ >
+ <FileConfiguration
+ Name="UnicodeRelease|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
</FileConfiguration>
-
-
- <FileConfiguration Name="UnicodeDebug|Win32">
-
-
- <Tool AdditionalIncludeDirectories="" BrowseInformation="1" Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions=""/>
-
-
+ <FileConfiguration
+ Name="UnicodeDebug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BrowseInformation="1"
+ />
</FileConfiguration>
-
-
- <FileConfiguration Name="Debug|Win32">
-
-
- <Tool AdditionalIncludeDirectories="" BrowseInformation="1" Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions=""/>
-
-
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BrowseInformation="1"
+ />
</FileConfiguration>
-
-
- <FileConfiguration Name="Release|Win32">
-
-
- <Tool AdditionalIncludeDirectories="" Name="VCCLCompilerTool" Optimization="1" PreprocessorDefinitions=""/>
-
-
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
</FileConfiguration>
-
-
</File>
-
-
- <File RelativePath="Common\CMoveConstraint.cpp">
-
-
- <FileConfiguration Name="UnicodeRelease|Win32">
-
-
- <Tool AdditionalIncludeDirectories="" Name="VCCLCompilerTool" Optimization="1" PreprocessorDefinitions=""/>
-
-
+ <File
+ RelativePath="Common\CMoveConstraint.cpp"
+ >
+ <FileConfiguration
+ Name="UnicodeRelease|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
</FileConfiguration>
-
-
- <FileConfiguration Name="UnicodeDebug|Win32">
-
-
- <Tool AdditionalIncludeDirectories="" BrowseInformation="1" Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions=""/>
-
-
+ <FileConfiguration
+ Name="UnicodeDebug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BrowseInformation="1"
+ />
</FileConfiguration>
-
-
- <FileConfiguration Name="Debug|Win32">
-
-
- <Tool AdditionalIncludeDirectories="" BrowseInformation="1" Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions=""/>
-
-
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BrowseInformation="1"
+ />
</FileConfiguration>
-
-
- <FileConfiguration Name="Release|Win32">
-
-
- <Tool AdditionalIncludeDirectories="" Name="VCCLCompilerTool" Optimization="1" PreprocessorDefinitions=""/>
-
-
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
</FileConfiguration>
-
-
</File>
-
-
- <File RelativePath="codepage.cpp">
-
-
- <FileConfiguration Name="UnicodeRelease|Win32">
-
-
- <Tool AdditionalIncludeDirectories="" Name="VCCLCompilerTool" Optimization="1" PreprocessorDefinitions=""/>
-
-
+ <File
+ RelativePath="codepage.cpp"
+ >
+ <FileConfiguration
+ Name="UnicodeRelease|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
</FileConfiguration>
-
-
- <FileConfiguration Name="UnicodeDebug|Win32">
-
-
- <Tool AdditionalIncludeDirectories="" BrowseInformation="1" Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions=""/>
-
-
+ <FileConfiguration
+ Name="UnicodeDebug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BrowseInformation="1"
+ />
</FileConfiguration>
-
-
- <FileConfiguration Name="Debug|Win32">
-
-
- <Tool AdditionalIncludeDirectories="" BrowseInformation="1" Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions=""/>
-
-
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BrowseInformation="1"
+ />
</FileConfiguration>
-
-
- <FileConfiguration Name="Release|Win32">
-
-
- <Tool AdditionalIncludeDirectories="" Name="VCCLCompilerTool" Optimization="1" PreprocessorDefinitions=""/>
-
-
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
</FileConfiguration>
-
-
</File>
-
-
- <File RelativePath="codepage_detect.cpp">
-
-
- <FileConfiguration Name="UnicodeRelease|Win32">
-
-
- <Tool AdditionalIncludeDirectories="" Name="VCCLCompilerTool" Optimization="1" PreprocessorDefinitions=""/>
-
-
+ <File
+ RelativePath="codepage_detect.cpp"
+ >
+ <FileConfiguration
+ Name="UnicodeRelease|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
</FileConfiguration>
-
-
- <FileConfiguration Name="UnicodeDebug|Win32">
-
-
- <Tool AdditionalIncludeDirectories="" BrowseInformation="1" Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions=""/>
-
-
+ <FileConfiguration
+ Name="UnicodeDebug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BrowseInformation="1"
+ />
</FileConfiguration>
-
-
- <FileConfiguration Name="Debug|Win32">
-
-
- <Tool AdditionalIncludeDirectories="" BrowseInformation="1" Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions=""/>
-
-
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BrowseInformation="1"
+ />
</FileConfiguration>
-
-
- <FileConfiguration Name="Release|Win32">
-
-
- <Tool AdditionalIncludeDirectories="" Name="VCCLCompilerTool" Optimization="1" PreprocessorDefinitions=""/>
-
-
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
</FileConfiguration>
-
-
</File>
-
-
- <File RelativePath="ColorButton.cpp">
-
-
- <FileConfiguration Name="UnicodeRelease|Win32">
-
-
- <Tool AdditionalIncludeDirectories="" Name="VCCLCompilerTool" Optimization="1" PreprocessorDefinitions=""/>
-
-
+ <File
+ RelativePath="ColorButton.cpp"
+ >
+ <FileConfiguration
+ Name="UnicodeRelease|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
</FileConfiguration>
-
-
- <FileConfiguration Name="UnicodeDebug|Win32">
-
-
- <Tool AdditionalIncludeDirectories="" BrowseInformation="1" Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions=""/>
-
-
+ <FileConfiguration
+ Name="UnicodeDebug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BrowseInformation="1"
+ />
</FileConfiguration>
-
-
- <FileConfiguration Name="Debug|Win32">
-
-
- <Tool AdditionalIncludeDirectories="" BrowseInformation="1" Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions=""/>
-
-
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BrowseInformation="1"
+ />
</FileConfiguration>
-
-
- <FileConfiguration Name="Release|Win32">
-
-
- <Tool AdditionalIncludeDirectories="" Name="VCCLCompilerTool" Optimization="1" PreprocessorDefinitions=""/>
-
-
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
</FileConfiguration>
-
-
</File>
-
-
- <File RelativePath="CompareOptions.cpp">
-
-
- <FileConfiguration Name="UnicodeRelease|Win32">
-
-
- <Tool AdditionalIncludeDirectories="" Name="VCCLCompilerTool" Optimization="1" PrecompiledHeaderFile="" PrecompiledHeaderThrough="" PreprocessorDefinitions="" UsePrecompiledHeader="0"/>
-
-
+ <File
+ RelativePath="CompareOptions.cpp"
+ >
+ <FileConfiguration
+ Name="UnicodeRelease|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""
+ />
</FileConfiguration>
-
-
- <FileConfiguration Name="UnicodeDebug|Win32">
-
-
- <Tool AdditionalIncludeDirectories="" BrowseInformation="1" Name="VCCLCompilerTool" Optimization="0" PrecompiledHeaderFile="" PrecompiledHeaderThrough="" PreprocessorDefinitions="" UsePrecompiledHeader="0"/>
-
-
+ <FileConfiguration
+ Name="UnicodeDebug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""
+ BrowseInformation="1"
+ />
</FileConfiguration>
-
-
- <FileConfiguration Name="Debug|Win32">
-
-
- <Tool AdditionalIncludeDirectories="" BrowseInformation="1" Name="VCCLCompilerTool" Optimization="0" PrecompiledHeaderFile="" PrecompiledHeaderThrough="" PreprocessorDefinitions="" UsePrecompiledHeader="0"/>
-
-
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""
+ BrowseInformation="1"
+ />
</FileConfiguration>
-
-
- <FileConfiguration Name="Release|Win32">
-
-
- <Tool AdditionalIncludeDirectories="" Name="VCCLCompilerTool" Optimization="1" PrecompiledHeaderFile="" PrecompiledHeaderThrough="" PreprocessorDefinitions="" UsePrecompiledHeader="0"/>
-
-
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""
+ />
</FileConfiguration>
-
-
</File>
-
-
- <File RelativePath="CompareStatisticsDlg.cpp">
-
-
- <FileConfiguration Name="UnicodeRelease|Win32">
-
-
- <Tool AdditionalIncludeDirectories="" Name="VCCLCompilerTool" Optimization="1" PreprocessorDefinitions=""/>
-
-
+ <File
+ RelativePath="CompareStatisticsDlg.cpp"
+ >
+ <FileConfiguration
+ Name="UnicodeRelease|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
</FileConfiguration>
-
-
- <FileConfiguration Name="UnicodeDebug|Win32">
-
-
- <Tool AdditionalIncludeDirectories="" BrowseInformation="1" Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions=""/>
-
-
+ <FileConfiguration
+ Name="UnicodeDebug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BrowseInformation="1"
+ />
</FileConfiguration>
-
-
- <FileConfiguration Name="Debug|Win32">
-
-
- <Tool AdditionalIncludeDirectories="" BrowseInformation="1" Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions=""/>
-
-
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BrowseInformation="1"
+ />
</FileConfiguration>
-
-
- <FileConfiguration Name="Release|Win32">
-
-
- <Tool AdditionalIncludeDirectories="" Name="VCCLCompilerTool" Optimization="1" PreprocessorDefinitions=""/>
-
-
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
</FileConfiguration>
-
-
</File>
-
-
- <File RelativePath="CompareStats.cpp">
-
-
- <FileConfiguration Name="UnicodeRelease|Win32">
-
-
- <Tool AdditionalIncludeDirectories="" Name="VCCLCompilerTool" Optimization="1" PrecompiledHeaderFile="" PrecompiledHeaderThrough="" PreprocessorDefinitions="" UsePrecompiledHeader="0"/>
-
-
+ <File
+ RelativePath="CompareStats.cpp"
+ >
+ <FileConfiguration
+ Name="UnicodeRelease|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""
+ />
</FileConfiguration>
-
-
- <FileConfiguration Name="UnicodeDebug|Win32">
-
-
- <Tool AdditionalIncludeDirectories="" BrowseInformation="1" Name="VCCLCompilerTool" Optimization="0" PrecompiledHeaderFile="" PrecompiledHeaderThrough="" PreprocessorDefinitions="" UsePrecompiledHeader="0"/>
-
-
+ <FileConfiguration
+ Name="UnicodeDebug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""
+ BrowseInformation="1"
+ />
</FileConfiguration>
-
-
- <FileConfiguration Name="Debug|Win32">
-
-
- <Tool AdditionalIncludeDirectories="" BrowseInformation="1" Name="VCCLCompilerTool" Optimization="0" PrecompiledHeaderFile="" PrecompiledHeaderThrough="" PreprocessorDefinitions="" UsePrecompiledHeader="0"/>
-
-
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""
+ BrowseInformation="1"
+ />
</FileConfiguration>
-
-
- <FileConfiguration Name="Release|Win32">
-
-
- <Tool AdditionalIncludeDirectories="" Name="VCCLCompilerTool" Optimization="1" PrecompiledHeaderFile="" PrecompiledHeaderThrough="" PreprocessorDefinitions="" UsePrecompiledHeader="0"/>
-
-
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""
+ />
</FileConfiguration>
-
-
</File>
-
-
- <File RelativePath="ConfigLog.cpp">
-
-
- <FileConfiguration Name="UnicodeRelease|Win32">
-
-
- <Tool AdditionalIncludeDirectories="" Name="VCCLCompilerTool" Optimization="1" PreprocessorDefinitions=""/>
-
-
+ <File
+ RelativePath="ConfigLog.cpp"
+ >
+ <FileConfiguration
+ Name="UnicodeRelease|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
</FileConfiguration>
-
-
- <FileConfiguration Name="UnicodeDebug|Win32">
-
-
- <Tool AdditionalIncludeDirectories="" BrowseInformation="1" Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions=""/>
-
-
+ <FileConfiguration
+ Name="UnicodeDebug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BrowseInformation="1"
+ />
</FileConfiguration>
-
-
- <FileConfiguration Name="Debug|Win32">
-
-
- <Tool AdditionalIncludeDirectories="" BrowseInformation="1" Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions=""/>
-
-
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BrowseInformation="1"
+ />
</FileConfiguration>
-
-
- <FileConfiguration Name="Release|Win32">
-
-
- <Tool AdditionalIn...
[truncated message content] |
|
From: <ge...@us...> - 2010-01-08 19:49:22
|
Revision: 7083
http://winmerge.svn.sourceforge.net/winmerge/?rev=7083&view=rev
Author: gerundt
Date: 2010-01-08 19:49:11 +0000 (Fri, 08 Jan 2010)
Log Message:
-----------
PATCH: [ 2925723 ] Add "Additional Tasks" dialog to MSI setup
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Installer/WiX/Fragments/Core.wxs
trunk/Installer/WiX/Fragments/Features.wxs
trunk/Installer/WiX/Fragments/WixUI_WinMerge.wxs
trunk/Installer/WiX/WinMerge.wixproj
trunk/Installer/WiX/WinMerge.wxs
Added Paths:
-----------
trunk/Installer/WiX/Fragments/WixUI_AdditionalTasksDlg.wxs
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2010-01-03 22:15:50 UTC (rev 7082)
+++ trunk/Docs/Users/ChangeLog.txt 2010-01-08 19:49:11 UTC (rev 7083)
@@ -7,6 +7,7 @@
Write config log as UTF-8 file (r7057)
Update PCRE to version 8.00 (r7068)
Update SCEW to version 1.1.1 (r7079)
+ Add "Additional Tasks" dialog to MSI setup (#2925723)
Bugfix: Plugin error after interrupting folder compare (#2919475)
Bugfix: GUI Word Wrap missing text (#2921400, #2894033)
Bugfix: Selected custom odepage was not used (#2921555)
Modified: trunk/Installer/WiX/Fragments/Core.wxs
===================================================================
--- trunk/Installer/WiX/Fragments/Core.wxs 2010-01-03 22:15:50 UTC (rev 7082)
+++ trunk/Installer/WiX/Fragments/Core.wxs 2010-01-08 19:49:11 UTC (rev 7083)
@@ -68,6 +68,7 @@
<!-- Startmenu shortcuts -->
<DirectoryRef Id="WinMergeMenuFolder">
<Component Id="StartMenuShortcuts" Guid="$(var.StartMenuShortcutsGuid)" Win64="$(var.Win64)">
+ <Condition>TASK_STARTMENUSHORTCUTS</Condition>
<Shortcut Id="WinMergeStartMenuShortcut"
Name="WinMerge"
Target="[INSTALLDIR]WinMergeU.exe"
@@ -88,6 +89,7 @@
<!-- Desktop shortcut -->
<DirectoryRef Id="DesktopFolder">
<Component Id="DesktopShortcut" Guid="$(var.DesktopShortcutGuid)" Win64="$(var.Win64)">
+ <Condition>TASK_DESKTOPSHORTCUT</Condition>
<Shortcut Id="WinMergeDesktopShortcut"
Name="WinMerge"
Target="[INSTALLDIR]WinMergeU.exe"
Modified: trunk/Installer/WiX/Fragments/Features.wxs
===================================================================
--- trunk/Installer/WiX/Fragments/Features.wxs 2010-01-03 22:15:50 UTC (rev 7082)
+++ trunk/Installer/WiX/Fragments/Features.wxs 2010-01-08 19:49:11 UTC (rev 7083)
@@ -17,6 +17,8 @@
<ComponentRef Id="libexpat" />
<ComponentRef Id="pcre" />
<ComponentRef Id="MergeLang" />
+ <ComponentRef Id="StartMenuShortcuts" />
+ <ComponentRef Id="DesktopShortcut" />
<Feature Id="ShellExtension"
AllowAdvertise="no"
Description="Explorer context menu integration"
@@ -24,18 +26,6 @@
Title="Shell Extension">
<ComponentRef Id="ShellExtension" />
</Feature>
- <Feature Id="StartMenuShortcuts"
- AllowAdvertise="no"
- Level="1"
- Title="Startmenu shortcut">
- <ComponentRef Id="StartMenuShortcuts" />
- </Feature>
- <Feature Id="DesktopShortcut"
- AllowAdvertise="no"
- Level="1"
- Title="Desktop shortcut">
- <ComponentRef Id="DesktopShortcut" />
- </Feature>
<Feature Id="Documentation" Absent="disallow" AllowAdvertise="no" Display="hidden" Level="1" Title="Documentation">
<ComponentRef Id="Files" />
<ComponentRef Id="Contributors" />
Added: trunk/Installer/WiX/Fragments/WixUI_AdditionalTasksDlg.wxs
===================================================================
--- trunk/Installer/WiX/Fragments/WixUI_AdditionalTasksDlg.wxs (rev 0)
+++ trunk/Installer/WiX/Fragments/WixUI_AdditionalTasksDlg.wxs 2010-01-08 19:49:11 UTC (rev 7083)
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) Microsoft Corporation. All rights reserved.
+
+ The use and distribution terms for this software are covered by the
+ Common Public License 1.0 (http://opensource.org/licenses/cpl.php)
+ which can be found in the file CPL.TXT at the root of this distribution.
+ By using this software in any fashion, you are agreeing to be bound by
+ the terms of this license.
+
+ You must not remove this notice, or any other, from this software.
+-->
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+ <Fragment>
+ <UI>
+ <!-- TODO: Use to <WixLocalization>
+ <Dialog Id="AdditionalTasksDlg" Width="370" Height="270" Title="!(loc.AdditionalTasksDlg_Title)">
+ -->
+ <Dialog Id="AdditionalTasksDlg" Width="370" Height="270" Title="[ProductName] Setup">
+ <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.WixUINext)" />
+ <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" />
+ <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
+ <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
+ </Control>
+
+ <!--<Control Id="SplitLine" Type="Line" X="0" Y="160" Width="370" Height="0" />-->
+ <Control Id="StartMenuShortcuts" Type="CheckBox" Height="18" Width="295" X="40" Y="70"
+ Text="Create the startmenu shortcuts"
+ Property="TASK_STARTMENUSHORTCUTS" CheckBoxValue="1" />
+ <Control Id="DesktopShortcut" Type="CheckBox" Height="18" Width="295" X="40" Y="90"
+ Text="Create a desktop shortcut"
+ Property="TASK_DESKTOPSHORTCUT" CheckBoxValue="1" />
+
+ <!-- TODO: Use to <WixLocalization>
+ <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.AdditionalTasksDlgDescription)" />
+ <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.AdditionalTasksDlgTitle)" />
+ <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.AdditionalTasksDlgBannerBitmap)" />
+ -->
+ <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes" Text="Which additional tasks should be performed?" />
+ <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="{\WixUI_Font_Title}Additional Tasks" />
+ <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="WixUI_Bmp_Banner" />
+ <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
+ <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
+ </Dialog>
+ </UI>
+ </Fragment>
+</Wix>
+
+<!-- TODO: Use to <WixLocalization>
+<WixLocalization Culture="en-us" xmlns="http://schemas.microsoft.com/wix/2006/localization">
+ <String Id="AdditionalTasksDlg_Title">[ProductName] Setup</String>
+ <String Id="AdditionalTasksDlgTitle">{\WixUI_Font_Title}Additional Tasks</String>
+ <String Id="AdditionalTasksDlgDescription">...</String>
+ <String Id="AdditionalTasksDlgBannerBitmap">WixUI_Bmp_Banner</String>
+</WixLocalization>
+-->
\ No newline at end of file
Modified: trunk/Installer/WiX/Fragments/WixUI_WinMerge.wxs
===================================================================
--- trunk/Installer/WiX/Fragments/WixUI_WinMerge.wxs 2010-01-03 22:15:50 UTC (rev 7082)
+++ trunk/Installer/WiX/Fragments/WixUI_WinMerge.wxs 2010-01-08 19:49:11 UTC (rev 7083)
@@ -16,10 +16,11 @@
- WixUI_WelcomeDlg - WixUI_MaintenanceWelcomeDlg
- WixUI_LicenseAgreementDlg - WixUI_MaintenanceTypeDlg
- WixUI_SetupTypeDlg - WixUI_CustomizeDlg
- - WixUI_VerifyReadyDlg - WixUI_VerifyReadyDlg
- - WixUI_CustomizeDlg
+ - WixUI_VerifyReadyDlg - WixUI_AdditionalTasksDlg
+ - WixUI_CustomizeDlg - WixUI_VerifyReadyDlg
- WixUI_DiskCostDlg
- WixUI_BrowseDlg
+ - WixUI_AdditionalTasksDlg
-->
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
@@ -49,14 +50,20 @@
<Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="SetupTypeDlg" Order="2">LicenseAccepted = "1"</Publish>
<Publish Dialog="SetupTypeDlg" Control="Back" Event="NewDialog" Value="LicenseAgreementDlg">1</Publish>
- <Publish Dialog="SetupTypeDlg" Control="TypicalButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+ <Publish Dialog="SetupTypeDlg" Control="TypicalButton" Event="NewDialog" Value="AdditionalTasksDlg">1</Publish>
<Publish Dialog="SetupTypeDlg" Control="CustomButton" Event="NewDialog" Value="CustomizeDlg">1</Publish>
- <Publish Dialog="SetupTypeDlg" Control="CompleteButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+ <Publish Dialog="SetupTypeDlg" Control="CompleteButton" Event="NewDialog" Value="AdditionalTasksDlg">1</Publish>
<Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="1">WixUI_InstallMode = "Change"</Publish>
<Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="SetupTypeDlg" Order="2">WixUI_InstallMode = "InstallCustom"</Publish>
- <Publish Dialog="CustomizeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+ <Publish Dialog="CustomizeDlg" Control="Next" Event="NewDialog" Value="AdditionalTasksDlg">1</Publish>
+ <Publish Dialog="AdditionalTasksDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg" Order="1">WixUI_InstallMode = "InstallCustom"</Publish>
+ <Publish Dialog="AdditionalTasksDlg" Control="Back" Event="NewDialog" Value="SetupTypeDlg" Order="2">WixUI_InstallMode = "InstallTypical" OR WixUI_InstallMode = "InstallComplete"</Publish>
+ <Publish Dialog="AdditionalTasksDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg" Order="3">WixUI_InstallMode = "Change"</Publish>
+ <Publish Dialog="AdditionalTasksDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="4">WixUI_InstallMode = "Repair" OR WixUI_InstallMode = "Remove"</Publish>
+ <Publish Dialog="AdditionalTasksDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+
<Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg" Order="1">WixUI_InstallMode = "InstallCustom"</Publish>
<Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="SetupTypeDlg" Order="2">WixUI_InstallMode = "InstallTypical" OR WixUI_InstallMode = "InstallComplete"</Publish>
<Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg" Order="3">WixUI_InstallMode = "Change"</Publish>
Modified: trunk/Installer/WiX/WinMerge.wixproj
===================================================================
--- trunk/Installer/WiX/WinMerge.wixproj 2010-01-03 22:15:50 UTC (rev 7082)
+++ trunk/Installer/WiX/WinMerge.wixproj 2010-01-08 19:49:11 UTC (rev 7083)
@@ -24,6 +24,7 @@
<Compile Include="Fragments\Languages.wxs"/>
<Compile Include="Fragments\Features.wxs"/>
<Compile Include="Fragments\WixUI_WinMerge.wxs"/>
+ <Compile Include="Fragments\WixUI_AdditionalTasksDlg.wxs"/>
</ItemGroup>
<Import Project="$(WixTargetsPath)"/>
Modified: trunk/Installer/WiX/WinMerge.wxs
===================================================================
--- trunk/Installer/WiX/WinMerge.wxs 2010-01-03 22:15:50 UTC (rev 7082)
+++ trunk/Installer/WiX/WinMerge.wxs 2010-01-08 19:49:11 UTC (rev 7083)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- candleArgs: "WinMerge.wxs" "Fragments\Core.wxs" "Fragments\Docs.wxs" "Fragments\Filters.wxs" "Fragments\Plugins.wxs" "Fragments\Languages.wxs" "Fragments\Features.wxs" "Fragments\WixUI_WinMerge.wxs" <extensions>
- lightArgs: "WinMerge.wixobj" "Core.wixobj" "Docs.wixobj" "Filters.wixobj" "Plugins.wixobj" "Languages.wixobj" "Features.wixobj" "WixUI_WinMerge.wixobj" -ext WixUIExtension -out "<projectname>.msi" <extensions>
+ candleArgs: "WinMerge.wxs" "Fragments\Core.wxs" "Fragments\Docs.wxs" "Fragments\Filters.wxs" "Fragments\Languages.wxs" "Fragments\Features.wxs" "Fragments\WixUI_WinMerge.wxs" "Fragments\WixUI_AdditionalTasksDlg.wxs" <extensions>
+ lightArgs: "WinMerge.wixobj" "Core.wixobj" "Docs.wixobj" "Filters.wixobj" "Languages.wixobj" "Features.wixobj" "WixUI_WinMerge.wixobj" "WixUI_AdditionalTasksDlg.wixobj" -ext WixUIExtension -out "<projectname>.msi" <extensions>
-->
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<?include Config.wxi ?>
@@ -16,7 +16,6 @@
* ClearCase
* Modify Path
* Don't install 32 bit version von Windows x64
- * Separate page for tasks (shortcuts, TortoiseSVN, ...)
* Install translated readme files
* Set WinMerge language
* Mutli-language support
@@ -62,6 +61,9 @@
<Merge Id="MFC" Language="0" SourceFile="$(var.MfcMergeModule)" DiskId="1" />
</Directory>
+ <Property Id="TASK_STARTMENUSHORTCUTS">1</Property>
+ <Property Id="TASK_DESKTOPSHORTCUT">1</Property>
+
<FeatureRef Id="WinMerge" />
<!-- TODO: Works this really? -->
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdo...@us...> - 2010-01-03 22:15:57
|
Revision: 7082
http://winmerge.svn.sourceforge.net/winmerge/?rev=7082&view=rev
Author: sdottaka
Date: 2010-01-03 22:15:50 +0000 (Sun, 03 Jan 2010)
Log Message:
-----------
BUG: [ 2925208 ] Font charset name in config log is incorrect
Modified Paths:
--------------
trunk/Src/Common/multiformatText.cpp
trunk/Src/ConfigLog.cpp
trunk/Src/DiffTextBuffer.cpp
trunk/Src/DiffWrapper.cpp
trunk/Src/DirCmpReport.cpp
trunk/Src/FileTransform.cpp
trunk/Src/HexMergeView.cpp
trunk/Src/VSSHelper.cpp
trunk/Src/files.cpp
Modified: trunk/Src/Common/multiformatText.cpp
===================================================================
--- trunk/Src/Common/multiformatText.cpp 2010-01-01 20:33:30 UTC (rev 7081)
+++ trunk/Src/Common/multiformatText.cpp 2010-01-03 22:15:50 UTC (rev 7082)
@@ -113,7 +113,7 @@
if (!::DeleteFile(m_tempFilenameDst.c_str()))
{
LogErrorString(Fmt(_T("DeleteFile(%s) failed: %s")
- , m_tempFilenameDst.c_str(), GetSysError(GetLastError())));
+ , m_tempFilenameDst.c_str(), GetSysError(GetLastError()).c_str()));
}
// we may reuse the temp filename
// tempFilenameDst.Empty();
@@ -126,7 +126,7 @@
if (!::DeleteFile(m_filename.c_str()))
{
LogErrorString(Fmt(_T("DeleteFile(%s) failed: %s")
- , m_filename.c_str(), GetSysError(GetLastError())));
+ , m_filename.c_str(), GetSysError(GetLastError()).c_str()));
}
::MoveFile(m_tempFilenameDst.c_str(), m_filename.c_str());
}
Modified: trunk/Src/ConfigLog.cpp
===================================================================
--- trunk/Src/ConfigLog.cpp 2010-01-01 20:33:30 UTC (rev 7081)
+++ trunk/Src/ConfigLog.cpp 2010-01-03 22:15:50 UTC (rev 7082)
@@ -522,7 +522,7 @@
FileWriteString(_T("\r\n Font:\r\n"));
FileWriteString(Fmt(_T(" Font facename: %s\r\n"), m_fontSettings.sFacename.c_str()));
FileWriteString(Fmt(_T(" Font charset: %d (%s)\r\n"), m_fontSettings.nCharset,
- FontCharsetName(m_fontSettings.nCharset)));
+ FontCharsetName(m_fontSettings.nCharset).c_str()));
// System settings
FileWriteString(_T("\r\nSystem settings:\r\n"));
Modified: trunk/Src/DiffTextBuffer.cpp
===================================================================
--- trunk/Src/DiffTextBuffer.cpp 2010-01-01 20:33:30 UTC (rev 7081)
+++ trunk/Src/DiffTextBuffer.cpp 2010-01-03 22:15:50 UTC (rev 7082)
@@ -515,7 +515,7 @@
if (!::DeleteFile(pszFileName))
{
LogErrorString(Fmt(_T("DeleteFile(%s) failed: %s"),
- pszFileName, GetSysError(GetLastError())));
+ pszFileName, GetSysError(GetLastError()).c_str()));
}
return nRetVal;
@@ -579,10 +579,10 @@
sError = uniErr.GetError().c_str();
if (bTempFile)
LogErrorString(Fmt(_T("Opening file %s failed: %s"),
- pszFileName, sError));
+ pszFileName, sError.c_str()));
else
LogErrorString(Fmt(_T("Opening file %s failed: %s"),
- sIntermediateFilename, sError));
+ sIntermediateFilename.c_str(), sError.c_str()));
}
return SAVE_FAILED;
}
@@ -648,7 +648,7 @@
if (!::DeleteFile(sIntermediateFilename.c_str()))
{
LogErrorString(Fmt(_T("DeleteFile(%s) failed: %s"),
- sIntermediateFilename.c_str(), GetSysError(GetLastError())));
+ sIntermediateFilename.c_str(), GetSysError(GetLastError()).c_str()));
}
// returns now, don't overwrite the original file
return SAVE_PACK_FAILED;
@@ -659,7 +659,7 @@
if (!::DeleteFile(sIntermediateFilename.c_str()))
{
LogErrorString(Fmt(_T("DeleteFile(%s) failed: %s"),
- sIntermediateFilename.c_str(), GetSysError(GetLastError())));
+ sIntermediateFilename.c_str(), GetSysError(GetLastError()).c_str()));
}
sIntermediateFilename = csTempFileName;
}
@@ -670,7 +670,7 @@
if (!::DeleteFile(sIntermediateFilename.c_str()))
{
LogErrorString(Fmt(_T("DeleteFile(%s) failed: %s"),
- sIntermediateFilename.c_str(), GetSysError(GetLastError())));
+ sIntermediateFilename.c_str(), GetSysError(GetLastError()).c_str()));
}
if (bClearModifiedFlag)
{
@@ -689,7 +689,7 @@
{
sError = GetSysError(GetLastError());
LogErrorString(Fmt(_T("CopyFile(%s, %s) failed: %s"),
- sIntermediateFilename.c_str(), pszFileName, sError));
+ sIntermediateFilename.c_str(), pszFileName, sError.c_str()));
}
}
else
Modified: trunk/Src/DiffWrapper.cpp
===================================================================
--- trunk/Src/DiffWrapper.cpp 2010-01-01 20:33:30 UTC (rev 7081)
+++ trunk/Src/DiffWrapper.cpp 2010-01-03 22:15:50 UTC (rev 7082)
@@ -820,7 +820,7 @@
if (!::DeleteFile(strFile1Temp.c_str()))
{
LogErrorString(Fmt(_T("DeleteFile(%s) failed: %s"),
- strFile1Temp.c_str(), GetSysError(GetLastError())));
+ strFile1Temp.c_str(), GetSysError(GetLastError()).c_str()));
}
strFile1Temp.erase();
}
@@ -829,7 +829,7 @@
if (!::DeleteFile(strFile2Temp.c_str()))
{
LogErrorString(Fmt(_T("DeleteFile(%s) failed: %s"),
- strFile2Temp.c_str(), GetSysError(GetLastError())));
+ strFile2Temp.c_str(), GetSysError(GetLastError()).c_str()));
}
strFile2Temp.erase();
}
Modified: trunk/Src/DirCmpReport.cpp
===================================================================
--- trunk/Src/DirCmpReport.cpp 2010-01-01 20:33:30 UTC (rev 7081)
+++ trunk/Src/DirCmpReport.cpp 2010-01-03 22:15:50 UTC (rev 7082)
@@ -364,8 +364,8 @@
{
WriteString(_T("")); // @todo xml declaration
WriteString(_T("<WinMergeDiffReport version=\"1\">\n"));
- WriteString(Fmt(_T("<left>%s</left>\n"), m_rootPaths.GetLeft()));
- WriteString(Fmt(_T("<right>%s</right>\n"), m_rootPaths.GetRight()));
+ WriteString(Fmt(_T("<left>%s</left>\n"), m_rootPaths.GetLeft().c_str()));
+ WriteString(Fmt(_T("<right>%s</right>\n"), m_rootPaths.GetRight().c_str()));
WriteString(Fmt(_T("<time>%s</time>\n"), GetCurrentTimeString().c_str()));
// Add column headers
Modified: trunk/Src/FileTransform.cpp
===================================================================
--- trunk/Src/FileTransform.cpp 2010-01-01 20:33:30 UTC (rev 7081)
+++ trunk/Src/FileTransform.cpp 2010-01-03 22:15:50 UTC (rev 7082)
@@ -452,7 +452,7 @@
if (!::DeleteFile(filepath.c_str()))
{
LogErrorString(Fmt(_T("DeleteFile(%s) failed: %s"),
- filepath.c_str(), GetSysError(GetLastError())));
+ filepath.c_str(), GetSysError(GetLastError()).c_str()));
}
}
// and change the filepath if everything works
@@ -463,7 +463,7 @@
if (!::DeleteFile(tempFilepath.c_str()))
{
LogErrorString(Fmt(_T("DeleteFile(%s) failed: %s"),
- tempFilepath.c_str(), GetSysError(GetLastError())));
+ tempFilepath.c_str(), GetSysError(GetLastError()).c_str()));
}
}
@@ -498,7 +498,7 @@
if (!::DeleteFile(filepath.c_str()))
{
LogErrorString(Fmt(_T("DeleteFile(%s) failed: %s"),
- filepath.c_str(), GetSysError(GetLastError())));
+ filepath.c_str(), GetSysError(GetLastError()).c_str()));
}
}
// and change the filepath if everything works
@@ -509,7 +509,7 @@
if (!::DeleteFile(tempFilepath.c_str()))
{
LogErrorString(Fmt(_T("DeleteFile(%s) failed: %s"),
- tempFilepath.c_str(), GetSysError(GetLastError())));
+ tempFilepath.c_str(), GetSysError(GetLastError()).c_str()));
}
}
@@ -641,7 +641,7 @@
if (!::DeleteFile(filepath.c_str()))
{
LogErrorString(Fmt(_T("DeleteFile(%s) failed: %s"),
- filepath.c_str(), GetSysError(GetLastError())));
+ filepath.c_str(), GetSysError(GetLastError()).c_str()));
}
}
// and change the filepath if everything works
@@ -652,7 +652,7 @@
if (!::DeleteFile(tempFilepath.c_str()))
{
LogErrorString(Fmt(_T("DeleteFile(%s) failed: %s"),
- tempFilepath.c_str(), GetSysError(GetLastError())));
+ tempFilepath.c_str(), GetSysError(GetLastError()).c_str()));
}
}
return TRUE;
Modified: trunk/Src/HexMergeView.cpp
===================================================================
--- trunk/Src/HexMergeView.cpp 2010-01-01 20:33:30 UTC (rev 7081)
+++ trunk/Src/HexMergeView.cpp 2010-01-03 22:15:50 UTC (rev 7082)
@@ -335,7 +335,7 @@
if (hr != S_OK)
{
LogErrorString(Fmt(_T("DeleteFile(%s) failed: %s"),
- sIntermediateFilename.c_str(), GetSysError(hr)));
+ sIntermediateFilename.c_str(), GetSysError(hr).c_str()));
}
return S_OK;
}
Modified: trunk/Src/VSSHelper.cpp
===================================================================
--- trunk/Src/VSSHelper.cpp 2010-01-01 20:33:30 UTC (rev 7081)
+++ trunk/Src/VSSHelper.cpp 2010-01-03 22:15:50 UTC (rev 7082)
@@ -64,14 +64,14 @@
if (tempPath.empty())
{
LogErrorString(Fmt(_T("CMainFrame::ReLinkVCProj() - couldn't get temppath: %s")
- , GetSysError(nerr)));
+ , GetSysError(nerr).c_str()));
return FALSE;
}
String tempFile = env_GetTempFileName(tempPath.c_str(), _T("_LT"), &nerr);
if (tempFile.empty())
{
LogErrorString(Fmt(_T("CMainFrame::ReLinkVCProj() - couldn't get tempfile: %s")
- , GetSysError(nerr)));
+ , GetSysError(nerr).c_str()));
return FALSE;
}
Modified: trunk/Src/files.cpp
===================================================================
--- trunk/Src/files.cpp 2010-01-01 20:33:30 UTC (rev 7081)
+++ trunk/Src/files.cpp 2010-01-03 22:15:50 UTC (rev 7082)
@@ -67,7 +67,7 @@
{
bSuccess = FALSE;
LogErrorString(Fmt(_T("CreateFile(%s) failed in files_openFileMapped: %s")
- , fileData->fileName, GetSysError(GetLastError())));
+ , fileData->fileName, GetSysError(GetLastError()).c_str()));
}
else
{
@@ -95,7 +95,7 @@
{
bSuccess = FALSE;
LogErrorString(Fmt(_T("CreateFileMapping(%s) failed: %s")
- , fileData->fileName, GetSysError(GetLastError())));
+ , fileData->fileName, GetSysError(GetLastError()).c_str()));
}
else
{
@@ -105,7 +105,7 @@
{
bSuccess = FALSE;
LogErrorString(Fmt(_T("MapViewOfFile(%s) failed: %s")
- , fileData->fileName, GetSysError(GetLastError())));
+ , fileData->fileName, GetSysError(GetLastError()).c_str()));
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2010-01-01 20:33:37
|
Revision: 7081
http://winmerge.svn.sourceforge.net/winmerge/?rev=7081&view=rev
Author: kimmov
Date: 2010-01-01 20:33:30 +0000 (Fri, 01 Jan 2010)
Log Message:
-----------
Migrate to API changes in new SCEW version.
Modified Paths:
--------------
trunk/Src/ProjectFile.cpp
Modified: trunk/Src/ProjectFile.cpp
===================================================================
--- trunk/Src/ProjectFile.cpp 2010-01-01 15:50:16 UTC (rev 7080)
+++ trunk/Src/ProjectFile.cpp 2010-01-01 20:33:30 UTC (rev 7081)
@@ -88,23 +88,30 @@
parser = scew_parser_create();
scew_parser_ignore_whitespaces(parser, 1);
+ scew_reader *reader = NULL;
FILE * fp = _tfopen(path, _T("r"));
if (fp)
{
- if (scew_parser_load_file_fp(parser, fp))
+ reader = scew_reader_fp_create(fp);
+ if (reader)
{
- tree = scew_parser_tree(parser);
+ tree = scew_parser_load (parser, reader);
- scew_element * root = GetRootElement(tree);
- if (root)
+ if (tree)
{
- // Currently our content is paths, so expect
- // having paths in valid project file!
- if (GetPathsData(root))
- loaded = TRUE;
- };
+ scew_element * root = GetRootElement(tree);
+ if (root)
+ {
+ // Currently our content is paths, so expect
+ // having paths in valid project file!
+ if (GetPathsData(root))
+ loaded = TRUE;
+ };
+ }
}
+
scew_tree_free(tree);
+ scew_reader_free(reader);
/* Frees the SCEW parser */
scew_parser_free(parser);
@@ -230,7 +237,7 @@
scew_element* paths = NULL;
tree = scew_tree_create();
- root = scew_tree_add_root(tree, Root_element_name);
+ root = scew_tree_set_root(tree, Root_element_name);
if (root != NULL)
{
paths = AddPathsElement(root);
@@ -247,14 +254,25 @@
scew_tree_set_xml_encoding(tree, "UTF-8");
- // Set the XML file standalone
- scew_tree_set_xml_standalone(tree, 1);
-
+ scew_writer *writer = NULL;
+ scew_printer *printer = NULL;
FILE * fp = _tfopen(path, _T("w"));
if (fp)
{
- if (!scew_writer_tree_fp(tree, fp))
+ writer = scew_writer_fp_create(fp);
+ if (writer)
{
+ printer = scew_printer_create(writer);
+
+ if (!scew_printer_print_tree(printer, tree) ||
+ !scew_printf(_XT("\n")))
+ {
+ success = FALSE;
+ *sError = theApp.LoadString(IDS_FILEWRITE_ERROR);
+ }
+ }
+ else
+ {
success = FALSE;
*sError = theApp.LoadString(IDS_FILEWRITE_ERROR);
}
@@ -267,6 +285,8 @@
/* Frees the SCEW tree */
scew_tree_free(tree);
+ scew_writer_free(writer);
+ scew_printer_free(printer);
if (success == FALSE)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2010-01-01 15:50:26
|
Revision: 7080
http://winmerge.svn.sourceforge.net/winmerge/?rev=7080&view=rev
Author: kimmov
Date: 2010-01-01 15:50:16 +0000 (Fri, 01 Jan 2010)
Log Message:
-----------
Downgrade SCEW project/solution file for VS2005.
Use earlier project file as a base and just update files in project.
Modified Paths:
--------------
trunk/Externals/scew/win32/scew.sln
trunk/Externals/scew/win32/scew.vcproj
Modified: trunk/Externals/scew/win32/scew.sln
===================================================================
--- trunk/Externals/scew/win32/scew.sln 2010-01-01 14:47:44 UTC (rev 7079)
+++ trunk/Externals/scew/win32/scew.sln 2010-01-01 15:50:16 UTC (rev 7080)
@@ -1,36 +1,36 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual C++ Express 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scew", "scew.vcproj", "{FEC3F558-143A-40B4-9427-A5E8FF1D29DA}"
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scew", "scew.vcproj", "{E27D4F53-46B1-49EE-B00E-103D03E50F48}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug UTF-16|Win32 = Debug UTF-16|Win32
+ Debug Unicode|Win32 = Debug Unicode|Win32
Debug|Win32 = Debug|Win32
- Release UTF-16|Win32 = Release UTF-16|Win32
+ Release Unicode|Win32 = Release Unicode|Win32
Release|Win32 = Release|Win32
- Static Debug UTF-16|Win32 = Static Debug UTF-16|Win32
- Static Debug|Win32 = Static Debug|Win32
- Static Release UTF-16|Win32 = Static Release UTF-16|Win32
- Static Release|Win32 = Static Release|Win32
+ XMLStatic Debug Unicode|Win32 = XMLStatic Debug Unicode|Win32
+ XMLStatic Debug|Win32 = XMLStatic Debug|Win32
+ XMLStatic Release Unicode|Win32 = XMLStatic Release Unicode|Win32
+ XMLStatic Release|Win32 = XMLStatic Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {FEC3F558-143A-40B4-9427-A5E8FF1D29DA}.Debug UTF-16|Win32.ActiveCfg = Debug UTF-16|Win32
- {FEC3F558-143A-40B4-9427-A5E8FF1D29DA}.Debug UTF-16|Win32.Build.0 = Debug UTF-16|Win32
- {FEC3F558-143A-40B4-9427-A5E8FF1D29DA}.Debug|Win32.ActiveCfg = Debug|Win32
- {FEC3F558-143A-40B4-9427-A5E8FF1D29DA}.Debug|Win32.Build.0 = Debug|Win32
- {FEC3F558-143A-40B4-9427-A5E8FF1D29DA}.Release UTF-16|Win32.ActiveCfg = Release UTF-16|Win32
- {FEC3F558-143A-40B4-9427-A5E8FF1D29DA}.Release UTF-16|Win32.Build.0 = Release UTF-16|Win32
- {FEC3F558-143A-40B4-9427-A5E8FF1D29DA}.Release|Win32.ActiveCfg = Release|Win32
- {FEC3F558-143A-40B4-9427-A5E8FF1D29DA}.Release|Win32.Build.0 = Release|Win32
- {FEC3F558-143A-40B4-9427-A5E8FF1D29DA}.Static Debug UTF-16|Win32.ActiveCfg = Static Debug UTF-16|Win32
- {FEC3F558-143A-40B4-9427-A5E8FF1D29DA}.Static Debug UTF-16|Win32.Build.0 = Static Debug UTF-16|Win32
- {FEC3F558-143A-40B4-9427-A5E8FF1D29DA}.Static Debug|Win32.ActiveCfg = Static Debug|Win32
- {FEC3F558-143A-40B4-9427-A5E8FF1D29DA}.Static Debug|Win32.Build.0 = Static Debug|Win32
- {FEC3F558-143A-40B4-9427-A5E8FF1D29DA}.Static Release UTF-16|Win32.ActiveCfg = Static Release UTF-16|Win32
- {FEC3F558-143A-40B4-9427-A5E8FF1D29DA}.Static Release UTF-16|Win32.Build.0 = Static Release UTF-16|Win32
- {FEC3F558-143A-40B4-9427-A5E8FF1D29DA}.Static Release|Win32.ActiveCfg = Static Release|Win32
- {FEC3F558-143A-40B4-9427-A5E8FF1D29DA}.Static Release|Win32.Build.0 = Static Release|Win32
+ {E27D4F53-46B1-49EE-B00E-103D03E50F48}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32
+ {E27D4F53-46B1-49EE-B00E-103D03E50F48}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32
+ {E27D4F53-46B1-49EE-B00E-103D03E50F48}.Debug|Win32.ActiveCfg = Debug|Win32
+ {E27D4F53-46B1-49EE-B00E-103D03E50F48}.Debug|Win32.Build.0 = Debug|Win32
+ {E27D4F53-46B1-49EE-B00E-103D03E50F48}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32
+ {E27D4F53-46B1-49EE-B00E-103D03E50F48}.Release Unicode|Win32.Build.0 = Release Unicode|Win32
+ {E27D4F53-46B1-49EE-B00E-103D03E50F48}.Release|Win32.ActiveCfg = Release|Win32
+ {E27D4F53-46B1-49EE-B00E-103D03E50F48}.Release|Win32.Build.0 = Release|Win32
+ {E27D4F53-46B1-49EE-B00E-103D03E50F48}.XMLStatic Debug Unicode|Win32.ActiveCfg = XMLStatic Debug Unicode|Win32
+ {E27D4F53-46B1-49EE-B00E-103D03E50F48}.XMLStatic Debug Unicode|Win32.Build.0 = XMLStatic Debug Unicode|Win32
+ {E27D4F53-46B1-49EE-B00E-103D03E50F48}.XMLStatic Debug|Win32.ActiveCfg = XMLStatic Debug|Win32
+ {E27D4F53-46B1-49EE-B00E-103D03E50F48}.XMLStatic Debug|Win32.Build.0 = XMLStatic Debug|Win32
+ {E27D4F53-46B1-49EE-B00E-103D03E50F48}.XMLStatic Release Unicode|Win32.ActiveCfg = XMLStatic Release Unicode|Win32
+ {E27D4F53-46B1-49EE-B00E-103D03E50F48}.XMLStatic Release Unicode|Win32.Build.0 = XMLStatic Release Unicode|Win32
+ {E27D4F53-46B1-49EE-B00E-103D03E50F48}.XMLStatic Release|Win32.ActiveCfg = XMLStatic Release|Win32
+ {E27D4F53-46B1-49EE-B00E-103D03E50F48}.XMLStatic Release|Win32.Build.0 = XMLStatic Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Modified: trunk/Externals/scew/win32/scew.vcproj
===================================================================
--- trunk/Externals/scew/win32/scew.vcproj 2010-01-01 14:47:44 UTC (rev 7079)
+++ trunk/Externals/scew/win32/scew.vcproj 2010-01-01 15:50:16 UTC (rev 7080)
@@ -1,12 +1,9 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="9,00"
+ Version="8.00"
Name="scew"
- ProjectGUID="{FEC3F558-143A-40B4-9427-A5E8FF1D29DA}"
- RootNamespace="scew"
- Keyword="Win32Proj"
- TargetFrameworkVersion="196613"
+ ProjectGUID="{E27D4F53-46B1-49EE-B00E-103D03E50F48}"
>
<Platforms>
<Platform
@@ -17,11 +14,14 @@
</ToolFiles>
<Configurations>
<Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)lib"
- IntermediateDirectory="$(SolutionDir)build\Debug"
- ConfigurationType="2"
- CharacterSet="1"
+ Name="Release|Win32"
+ OutputDirectory=".\..\..\..\Build\scew\Release"
+ IntermediateDirectory=".\..\..\..\BuildTmp\scew\Release"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
@@ -40,38 +40,41 @@
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
- PreprocessorDefinitions="SCEW_DEBUG;SCEW_DLL;DLL_EXPORTS;_CRT_SECURE_NO_WARNINGS"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="4"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="../../expat/lib,../../expat/xmlwf"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ PrecompiledHeaderFile=".\..\..\..\BuildTmp\scew\Release/scew.pch"
+ AssemblerListingLocation=".\..\..\..\BuildTmp\scew\Release/"
+ ObjectFile=".\..\..\..\BuildTmp\scew\Release/"
+ ProgramDataBaseFileName=".\..\..\..\BuildTmp\scew\Release/"
+ WarningLevel="4"
+ SuppressStartupBanner="true"
+ CompileAs="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1041"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
- Name="VCLinkerTool"
- AdditionalDependencies="libexpat.lib"
- OutputFile="$(OutDir)\libscewd.dll"
- LinkIncremental="1"
- GenerateManifest="false"
+ Name="VCLibrarianTool"
+ OutputFile="..\..\..\Build\scew\scew.lib"
+ SuppressStartupBanner="true"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
- Name="VCManifestTool"
- />
- <Tool
Name="VCXDCMakeTool"
/>
<Tool
@@ -81,19 +84,18 @@
Name="VCFxCopTool"
/>
<Tool
- Name="VCAppVerifierTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)lib"
- IntermediateDirectory="$(SolutionDir)build\Release"
- ConfigurationType="2"
- CharacterSet="1"
- WholeProgramOptimization="1"
+ Name="XMLStatic Release|Win32"
+ OutputDirectory=".\..\..\..\Build\scew\ReleaseS"
+ IntermediateDirectory=".\..\..\..\BuildTmp\scew\ReleaseS"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
@@ -113,39 +115,40 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- EnableIntrinsicFunctions="true"
- PreprocessorDefinitions="NDEBUG;SCEW_DLL;DLL_EXPORTS;_CRT_SECURE_NO_WARNINGS"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="../../expat/lib,../../expat/xmlwf"
+ PreprocessorDefinitions="NDEBUG;WIN32;_LIB;XML_STATIC"
+ StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
+ PrecompiledHeaderFile=".\..\..\..\BuildTmp\scew\ReleaseS/scew.pch"
+ AssemblerListingLocation=".\..\..\..\BuildTmp\scew\ReleaseS/"
+ ObjectFile=".\..\..\..\BuildTmp\scew\ReleaseS/"
+ ProgramDataBaseFileName=".\..\..\..\BuildTmp\scew\ReleaseS/"
+ WarningLevel="4"
+ SuppressStartupBanner="true"
+ CompileAs="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1041"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
- Name="VCLinkerTool"
- AdditionalDependencies="libexpat.lib"
- OutputFile="$(OutDir)\libscew.dll"
- LinkIncremental="1"
- GenerateManifest="false"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
+ Name="VCLibrarianTool"
+ OutputFile="..\..\..\Build\scew\scew_s.lib"
+ SuppressStartupBanner="true"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
- Name="VCManifestTool"
- />
- <Tool
Name="VCXDCMakeTool"
/>
<Tool
@@ -155,18 +158,18 @@
Name="VCFxCopTool"
/>
<Tool
- Name="VCAppVerifierTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
- Name="Debug UTF-16|Win32"
- OutputDirectory="$(SolutionDir)lib"
- IntermediateDirectory="$(SolutionDir)build\DebugW"
- ConfigurationType="2"
- CharacterSet="1"
+ Name="XMLStatic Debug|Win32"
+ OutputDirectory=".\..\..\..\Build\scew\DebugS"
+ IntermediateDirectory=".\..\..\..\BuildTmp\scew\DebugS"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
@@ -186,37 +189,39 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- PreprocessorDefinitions="SCEW_DEBUG;SCEW_DLL;DLL_EXPORTS;XML_UNICODE_WCHAR_T;_CRT_SECURE_NO_WARNINGS"
- MinimalRebuild="true"
+ AdditionalIncludeDirectories="../../expat/lib,../../expat/xmlwf"
+ PreprocessorDefinitions="_DEBUG;WIN32;_LIB;XML_STATIC"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
+ PrecompiledHeaderFile=".\..\..\..\BuildTmp\scew\DebugS/scew.pch"
+ AssemblerListingLocation=".\..\..\..\BuildTmp\scew\DebugS/"
+ ObjectFile=".\..\..\..\BuildTmp\scew\DebugS/"
+ ProgramDataBaseFileName=".\..\..\..\BuildTmp\scew\DebugS/"
+ WarningLevel="4"
+ SuppressStartupBanner="true"
DebugInformationFormat="4"
+ CompileAs="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1041"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
- Name="VCLinkerTool"
- AdditionalDependencies="libexpatw.lib"
- OutputFile="$(OutDir)\libscewwd.dll"
- LinkIncremental="1"
- GenerateManifest="false"
+ Name="VCLibrarianTool"
+ OutputFile="..\..\..\Build\scew\scew_sd.lib"
+ SuppressStartupBanner="true"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
- Name="VCManifestTool"
- />
- <Tool
Name="VCXDCMakeTool"
/>
<Tool
@@ -226,19 +231,18 @@
Name="VCFxCopTool"
/>
<Tool
- Name="VCAppVerifierTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
- Name="Release UTF-16|Win32"
- OutputDirectory="$(SolutionDir)lib"
- IntermediateDirectory="$(SolutionDir)build\ReleaseW"
- ConfigurationType="2"
+ Name="XMLStatic Debug Unicode|Win32"
+ OutputDirectory=".\..\..\..\Build\scew\DebugUS"
+ IntermediateDirectory=".\..\..\..\BuildTmp\scew\DebugUS"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="1"
- WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -257,40 +261,40 @@
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="2"
- EnableIntrinsicFunctions="true"
- PreprocessorDefinitions="NDEBUG;SCEW_DLL;DLL_EXPORTS;XML_UNICODE_WCHAR_T;_CRT_SECURE_NO_WARNINGS"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
+ Optimization="0"
+ AdditionalIncludeDirectories="../../expat/lib,../../expat/xmlwf"
+ PreprocessorDefinitions="_DEBUG;XML_STATIC;WIN32;_LIB;XML_UNICODE_WCHAR_T"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ PrecompiledHeaderFile=".\..\..\..\BuildTmp\scew\DebugUS/scew.pch"
+ AssemblerListingLocation=".\..\..\..\BuildTmp\scew\DebugUS/"
+ ObjectFile=".\..\..\..\BuildTmp\scew\DebugUS/"
+ ProgramDataBaseFileName=".\..\..\..\BuildTmp\scew\DebugUS/"
+ WarningLevel="4"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="4"
+ CompileAs="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1041"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
- Name="VCLinkerTool"
- AdditionalDependencies="libexpatw.lib"
- OutputFile="$(OutDir)\libsceww.dll"
- LinkIncremental="1"
- GenerateManifest="false"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
+ Name="VCLibrarianTool"
+ OutputFile="..\..\..\Build\scew\scew_usd.lib"
+ SuppressStartupBanner="true"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
- Name="VCManifestTool"
- />
- <Tool
Name="VCXDCMakeTool"
/>
<Tool
@@ -300,17 +304,17 @@
Name="VCFxCopTool"
/>
<Tool
- Name="VCAppVerifierTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
- Name="Static Debug|Win32"
- OutputDirectory="$(SolutionDir)lib"
- IntermediateDirectory="$(SolutionDir)build\DebugS"
+ Name="Release Unicode|Win32"
+ OutputDirectory=".\..\..\..\Build\scew\ReleaseU"
+ IntermediateDirectory=".\..\..\..\BuildTmp\scew\ReleaseU"
ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="1"
>
<Tool
@@ -330,27 +334,36 @@
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
- PreprocessorDefinitions="SCEW_DEBUG;XML_STATIC;_CRT_SECURE_NO_WARNINGS"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="4"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="../../expat/lib,../../expat/xmlwf"
+ PreprocessorDefinitions="NDEBUG;WIN32;_LIB;XML_UNICODE_WCHAR_T"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ PrecompiledHeaderFile=".\..\..\..\BuildTmp\scew\ReleaseU/scew.pch"
+ AssemblerListingLocation=".\..\..\..\BuildTmp\scew\ReleaseU/"
+ ObjectFile=".\..\..\..\BuildTmp\scew\ReleaseU/"
+ ProgramDataBaseFileName=".\..\..\..\BuildTmp\scew\ReleaseU/"
+ WarningLevel="4"
+ SuppressStartupBanner="true"
+ CompileAs="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1041"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="$(OutDir)\libscewdMT.lib"
+ OutputFile="..\..\..\Build\scew\scew_u.lib"
+ SuppressStartupBanner="true"
/>
<Tool
Name="VCALinkTool"
@@ -369,10 +382,13 @@
/>
</Configuration>
<Configuration
- Name="Static Debug UTF-16|Win32"
- OutputDirectory="$(SolutionDir)lib"
- IntermediateDirectory="$(SolutionDir)build\DebugWS"
+ Name="XMLStatic Release Unicode|Win32"
+ OutputDirectory=".\..\..\..\Build\scew\ReleaseUS"
+ IntermediateDirectory=".\..\..\..\BuildTmp\scew\ReleaseUS"
ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="1"
>
<Tool
@@ -392,27 +408,36 @@
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
- PreprocessorDefinitions="SCEW_DEBUG;XML_STATIC;XML_UNICODE_WCHAR_T;_CRT_SECURE_NO_WARNINGS"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="4"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="../../expat/lib,../../expat/xmlwf"
+ PreprocessorDefinitions="NDEBUG;XML_STATIC;WIN32;_LIB;XML_UNICODE_WCHAR_T"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ PrecompiledHeaderFile=".\..\..\..\BuildTmp\scew\ReleaseUS/scew.pch"
+ AssemblerListingLocation=".\..\..\..\BuildTmp\scew\ReleaseUS/"
+ ObjectFile=".\..\..\..\BuildTmp\scew\ReleaseUS/"
+ ProgramDataBaseFileName=".\..\..\..\BuildTmp\scew\ReleaseUS/"
+ WarningLevel="4"
+ SuppressStartupBanner="true"
+ CompileAs="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1041"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="$(OutDir)\libscewwdMT.lib"
+ OutputFile="..\..\..\Build\scew\scew_us.lib"
+ SuppressStartupBanner="true"
/>
<Tool
Name="VCALinkTool"
@@ -431,12 +456,14 @@
/>
</Configuration>
<Configuration
- Name="Static Release|Win32"
- OutputDirectory="$(SolutionDir)lib"
- IntermediateDirectory="$(SolutionDir)build\ReleaseS"
+ Name="Debug Unicode|Win32"
+ OutputDirectory=".\..\..\..\Build\scew\DebugU"
+ IntermediateDirectory=".\..\..\..\BuildTmp\scew\DebugU"
ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="1"
- WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -455,27 +482,35 @@
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="2"
- EnableIntrinsicFunctions="true"
- PreprocessorDefinitions="NDEBUG;XML_STATIC;_CRT_SECURE_NO_WARNINGS"
- RuntimeLibrary="0"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
+ Optimization="0"
+ AdditionalIncludeDirectories="../../expat/lib,../../expat/xmlwf"
+ PreprocessorDefinitions="_DEBUG;WIN32;_LIB;XML_UNICODE_WCHAR_T"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ PrecompiledHeaderFile=".\..\..\..\BuildTmp\scew\DebugU/scew.pch"
+ AssemblerListingLocation=".\..\..\..\BuildTmp\scew\DebugU/"
+ ObjectFile=".\..\..\..\BuildTmp\scew\DebugU/"
+ ProgramDataBaseFileName=".\..\..\..\BuildTmp\scew\DebugU/"
+ WarningLevel="4"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="4"
+ CompileAs="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1041"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="$(OutDir)\libscewMT.lib"
+ OutputFile="..\..\..\Build\scew\scew_ud.lib"
+ SuppressStartupBanner="true"
/>
<Tool
Name="VCALinkTool"
@@ -494,12 +529,14 @@
/>
</Configuration>
<Configuration
- Name="Static Release UTF-16|Win32"
- OutputDirectory="$(SolutionDir)lib"
- IntermediateDirectory="$(SolutionDir)build\ReleaseWS"
+ Name="Debug|Win32"
+ OutputDirectory=".\..\..\..\Build\scew\Debug"
+ IntermediateDirectory=".\..\..\..\Build\scew\Debug"
ConfigurationType="4"
- CharacterSet="1"
- WholeProgramOptimization="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
@@ -518,27 +555,35 @@
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="2"
- EnableIntrinsicFunctions="true"
- PreprocessorDefinitions="NDEBUG;XML_STATIC;XML_UNICODE_WCHAR_T;_CRT_SECURE_NO_WARNINGS"
- RuntimeLibrary="0"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
+ Optimization="0"
+ AdditionalIncludeDirectories="../../expat/lib,../../expat/xmlwf"
+ PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ PrecompiledHeaderFile=".\..\..\..\Build\scew\Debug/scew.pch"
+ AssemblerListingLocation=".\..\..\..\Build\scew\Debug/"
+ ObjectFile=".\..\..\..\Build\scew\Debug/"
+ ProgramDataBaseFileName=".\..\..\..\Build\scew\Debug/"
+ WarningLevel="4"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="4"
+ CompileAs="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1041"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="$(OutDir)\libscewwMT.lib"
+ OutputFile="..\..\..\Build\scew\scew_d.lib"
+ SuppressStartupBanner="true"
/>
<Tool
Name="VCALinkTool"
@@ -562,44 +607,379 @@
<Files>
<Filter
Name="Source Files"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
>
<File
RelativePath="..\scew\attribute.c"
>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Debug Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="_DEBUG;XML_STATIC;WIN32;_LIB;_UNICODE;XML_UNICODE_WCHAR_T;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="NDEBUG;WIN32;_LIB;_UNICODE;XML_UNICODE_WCHAR_T;$(NoInherit)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Release Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="NDEBUG;XML_STATIC;WIN32;_LIB;_UNICODE;XML_UNICODE_WCHAR_T;$(NoInherit)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="_DEBUG;WIN32;_LIB;_UNICODE;XML_UNICODE_WCHAR_T;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="..\scew\element.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
>
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Debug Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="_DEBUG;XML_STATIC;WIN32;_LIB;_UNICODE;XML_UNICODE_WCHAR_T;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="NDEBUG;WIN32;_LIB;_UNICODE;XML_UNICODE_WCHAR_T;$(NoInherit)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Release Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="NDEBUG;XML_STATIC;WIN32;_LIB;_UNICODE;XML_UNICODE_WCHAR_T;$(NoInherit)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="_DEBUG;WIN32;_LIB;_UNICODE;XML_UNICODE_WCHAR_T;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="..\scew\element_attribute.c"
- >
+ >
</File>
<File
RelativePath="..\scew\element_compare.c"
- >
+ >
</File>
<File
RelativePath="..\scew\element_copy.c"
- >
+ >
</File>
<File
RelativePath="..\scew\element_search.c"
- >
+ >
</File>
<File
RelativePath="..\scew\error.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
>
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Debug Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="_DEBUG;XML_STATIC;WIN32;_LIB;_UNICODE;XML_UNICODE_WCHAR_T;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="NDEBUG;WIN32;_LIB;_UNICODE;XML_UNICODE_WCHAR_T;$(NoInherit)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Release Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="NDEBUG;XML_STATIC;WIN32;_LIB;_UNICODE;XML_UNICODE_WCHAR_T;$(NoInherit)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="_DEBUG;WIN32;_LIB;_UNICODE;XML_UNICODE_WCHAR_T;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="..\scew\list.c"
- >
+ >
</File>
<File
RelativePath="..\scew\parser.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
>
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Debug Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="_DEBUG;XML_STATIC;WIN32;_LIB;_UNICODE;XML_UNICODE_WCHAR_T;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="NDEBUG;WIN32;_LIB;_UNICODE;XML_UNICODE_WCHAR_T;$(NoInherit)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Release Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="NDEBUG;XML_STATIC;WIN32;_LIB;_UNICODE;XML_UNICODE_WCHAR_T;$(NoInherit)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="_DEBUG;WIN32;_LIB;_UNICODE;XML_UNICODE_WCHAR_T;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="..\scew\printer.c"
@@ -607,73 +987,576 @@
</File>
<File
RelativePath="..\scew\reader.c"
- >
+ >
</File>
<File
RelativePath="..\scew\reader_buffer.c"
- >
+ >
</File>
<File
RelativePath="..\scew\reader_file.c"
- >
+ >
</File>
<File
RelativePath="..\scew\str.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
>
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Debug Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="_DEBUG;XML_STATIC;WIN32;_LIB;_UNICODE;XML_UNICODE_WCHAR_T;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="NDEBUG;WIN32;_LIB;_UNICODE;XML_UNICODE_WCHAR_T;$(NoInherit)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Release Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="NDEBUG;XML_STATIC;WIN32;_LIB;_UNICODE;XML_UNICODE_WCHAR_T;$(NoInherit)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="_DEBUG;WIN32;_LIB;_UNICODE;XML_UNICODE_WCHAR_T;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="..\scew\tree.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
>
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Debug Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="_DEBUG;XML_STATIC;WIN32;_LIB;_UNICODE;XML_UNICODE_WCHAR_T;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="NDEBUG;WIN32;_LIB;_UNICODE;XML_UNICODE_WCHAR_T;$(NoInherit)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Release Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="NDEBUG;XML_STATIC;WIN32;_LIB;_UNICODE;XML_UNICODE_WCHAR_T;$(NoInherit)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="_DEBUG;WIN32;_LIB;_UNICODE;XML_UNICODE_WCHAR_T;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="..\scew\writer.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
>
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Debug Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="_DEBUG;XML_STATIC;WIN32;_LIB;_UNICODE;XML_UNICODE_WCHAR_T;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="NDEBUG;WIN32;_LIB;_UNICODE;XML_UNICODE_WCHAR_T;$(NoInherit)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Release Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="NDEBUG;XML_STATIC;WIN32;_LIB;_UNICODE;XML_UNICODE_WCHAR_T;$(NoInherit)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="_DEBUG;WIN32;_LIB;_UNICODE;XML_UNICODE_WCHAR_T;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="..\scew\writer_buffer.c"
- >
+ >
</File>
<File
RelativePath="..\scew\writer_file.c"
- >
+ >
</File>
<File
RelativePath="..\scew\xattribute.c"
>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Debug Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="_DEBUG;XML_STATIC;WIN32;_LIB;_UNICODE;XML_UNICODE_WCHAR_T;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="NDEBUG;WIN32;_LIB;_UNICODE;XML_UNICODE_WCHAR_T;$(NoInherit)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Release Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="NDEBUG;XML_STATIC;WIN32;_LIB;_UNICODE;XML_UNICODE_WCHAR_T;$(NoInherit)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="_DEBUG;WIN32;_LIB;_UNICODE;XML_UNICODE_WCHAR_T;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="..\scew\xerror.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
>
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Debug Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="_DEBUG;XML_STATIC;WIN32;_LIB;_UNICODE;XML_UNICODE_WCHAR_T;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="NDEBUG;WIN32;_LIB;_UNICODE;XML_UNICODE_WCHAR_T;$(NoInherit)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Release Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="NDEBUG;XML_STATIC;WIN32;_LIB;_UNICODE;XML_UNICODE_WCHAR_T;$(NoInherit)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="_DEBUG;WIN32;_LIB;_UNICODE;XML_UNICODE_WCHAR_T;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="..\scew\xparser.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
>
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Debug Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="_DEBUG;XML_STATIC;WIN32;_LIB;_UNICODE;XML_UNICODE_WCHAR_T;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="NDEBUG;WIN32;_LIB;_UNICODE;XML_UNICODE_WCHAR_T;$(NoInherit)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Release Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="NDEBUG;XML_STATIC;WIN32;_LIB;_UNICODE;XML_UNICODE_WCHAR_T;$(NoInherit)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="_DEBUG;WIN32;_LIB;_UNICODE;XML_UNICODE_WCHAR_T;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
</File>
</Filter>
<Filter
Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
- >
+ Filter="h;hpp;hxx;hm;inl"
+ >
<File
RelativePath="..\scew\attribute.h"
- >
+ >
</File>
<File
RelativePath="..\scew\bool.h"
- >
+ >
</File>
<File
RelativePath="..\scew\element.h"
- >
+ >
</File>
<File
RelativePath="..\scew\error.h"
- >
+ >
</File>
<File
RelativePath="..\scew\export.h"
- >
+ >
</File>
<File
RelativePath="..\scew\list.h"
@@ -681,7 +1564,7 @@
</File>
<File
RelativePath="..\scew\parser.h"
- >
+ >
</File>
<File
RelativePath="..\scew\printer.h"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-12-31 20:43:01
|
Revision: 7077
http://winmerge.svn.sourceforge.net/winmerge/?rev=7077&view=rev
Author: kimmov
Date: 2009-12-31 20:10:44 +0000 (Thu, 31 Dec 2009)
Log Message:
-----------
Add 64-bit build target for PCRE.
Added Paths:
-----------
trunk/Externals/pcre/Win64/
trunk/Externals/pcre/Win64/ALL_BUILD.vcproj
trunk/Externals/pcre/Win64/CMakeCache.txt
trunk/Externals/pcre/Win64/CMakeFiles/
trunk/Externals/pcre/Win64/CMakeFiles/ALL_BUILD.rule
trunk/Externals/pcre/Win64/CMakeFiles/CMakeCCompiler.cmake
trunk/Externals/pcre/Win64/CMakeFiles/CMakeCPlatform.cmake
trunk/Externals/pcre/Win64/CMakeFiles/CMakeCXXCompiler.cmake
trunk/Externals/pcre/Win64/CMakeFiles/CMakeCXXPlatform.cmake
trunk/Externals/pcre/Win64/CMakeFiles/CMakeDetermineCompilerABI_C.bin
trunk/Externals/pcre/Win64/CMakeFiles/CMakeDetermineCompilerABI_CXX.bin
trunk/Externals/pcre/Win64/CMakeFiles/CMakeError.log
trunk/Externals/pcre/Win64/CMakeFiles/CMakeOutput.log
trunk/Externals/pcre/Win64/CMakeFiles/CMakeRCCompiler.cmake
trunk/Externals/pcre/Win64/CMakeFiles/CMakeSystem.cmake
trunk/Externals/pcre/Win64/CMakeFiles/CheckTypeSize.bin
trunk/Externals/pcre/Win64/CMakeFiles/INSTALL_force.rule
trunk/Externals/pcre/Win64/CMakeFiles/RUN_TESTS_force.rule
trunk/Externals/pcre/Win64/CMakeFiles/TargetDirectories.txt
trunk/Externals/pcre/Win64/CMakeFiles/ZERO_CHECK.rule
trunk/Externals/pcre/Win64/CMakeFiles/cmake.check_cache
trunk/Externals/pcre/Win64/CMakeFiles/generate.stamp
trunk/Externals/pcre/Win64/CMakeFiles/generate.stamp.depend
trunk/Externals/pcre/Win64/CMakeFiles/generate.stamp.list
trunk/Externals/pcre/Win64/CTestCustom.ctest
trunk/Externals/pcre/Win64/CTestTestfile.cmake
trunk/Externals/pcre/Win64/INSTALL.vcproj
trunk/Externals/pcre/Win64/PCRE.sln
trunk/Externals/pcre/Win64/RUN_TESTS.vcproj
trunk/Externals/pcre/Win64/ZERO_CHECK.vcproj
trunk/Externals/pcre/Win64/cmake_install.cmake
trunk/Externals/pcre/Win64/config.h
trunk/Externals/pcre/Win64/pcre.h
trunk/Externals/pcre/Win64/pcre.vcproj
trunk/Externals/pcre/Win64/pcre_chartables.c
trunk/Externals/pcre/Win64/pcre_scanner_unittest.vcproj
trunk/Externals/pcre/Win64/pcre_stringpiece.h
trunk/Externals/pcre/Win64/pcre_stringpiece_unittest.vcproj
trunk/Externals/pcre/Win64/pcrecpp.vcproj
trunk/Externals/pcre/Win64/pcrecpp_unittest.vcproj
trunk/Externals/pcre/Win64/pcrecpparg.h
trunk/Externals/pcre/Win64/pcregrep.vcproj
trunk/Externals/pcre/Win64/pcreposix.vcproj
trunk/Externals/pcre/Win64/pcretest.vcproj
Property changes on: trunk/Externals/pcre/Win64
___________________________________________________________________
Added: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Added: bugtraq:logregex
+ (\d{6,})
Added: trunk/Externals/pcre/Win64/ALL_BUILD.vcproj
===================================================================
--- trunk/Externals/pcre/Win64/ALL_BUILD.vcproj (rev 0)
+++ trunk/Externals/pcre/Win64/ALL_BUILD.vcproj 2009-12-31 20:10:44 UTC (rev 7077)
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding = "Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="ALL_BUILD"
+ ProjectGUID="{621A3727-83D9-4122-AF50-887943250F0E}"
+ Keyword="Win32Proj">
+ <Platforms>
+ <Platform
+ Name="x64"/>
+ </Platforms>
+ <Configurations>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="Debug"
+ IntermediateDirectory="ALL_BUILD.dir\Debug"
+ ConfigurationType="10"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre;"
+ ExceptionHandling="0"
+ PreprocessorDefinitions="HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"Debug\""
+ AssemblerListingLocation="Debug"
+ ObjectFile="$(IntDir)\"
+/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ AdditionalIncludeDirectories="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre;"
+ PreprocessorDefinitions="HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"Debug\""/>
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"Debug\""
+ MkTypLibCompatible="FALSE"
+ TargetEnvironment="3"
+ GenerateStublessProxies="TRUE"
+ TypeLibraryName="$(InputName).tlb"
+ OutputDirectory="$(IntDir)"
+ HeaderFileName="$(InputName).h"
+ DLLDataFileName=""
+ InterfaceIdentifierFileName="$(InputName)_i.c"
+ ProxyFileName="$(InputName)_p.c"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="Release"
+ IntermediateDirectory="ALL_BUILD.dir\Release"
+ ConfigurationType="10"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre;"
+ ExceptionHandling="0"
+ PreprocessorDefinitions="HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"Release\""
+ AssemblerListingLocation="Release"
+ ObjectFile="$(IntDir)\"
+/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ AdditionalIncludeDirectories="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre;"
+ PreprocessorDefinitions="HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"Release\""/>
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"Release\""
+ MkTypLibCompatible="FALSE"
+ TargetEnvironment="3"
+ GenerateStublessProxies="TRUE"
+ TypeLibraryName="$(InputName).tlb"
+ OutputDirectory="$(IntDir)"
+ HeaderFileName="$(InputName).h"
+ DLLDataFileName=""
+ InterfaceIdentifierFileName="$(InputName)_i.c"
+ ProxyFileName="$(InputName)_p.c"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ </Configuration>
+ <Configuration
+ Name="MinSizeRel|x64"
+ OutputDirectory="MinSizeRel"
+ IntermediateDirectory="ALL_BUILD.dir\MinSizeRel"
+ ConfigurationType="10"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre;"
+ ExceptionHandling="0"
+ PreprocessorDefinitions="HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"MinSizeRel\""
+ AssemblerListingLocation="MinSizeRel"
+ ObjectFile="$(IntDir)\"
+/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ AdditionalIncludeDirectories="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre;"
+ PreprocessorDefinitions="HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"MinSizeRel\""/>
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"MinSizeRel\""
+ MkTypLibCompatible="FALSE"
+ TargetEnvironment="3"
+ GenerateStublessProxies="TRUE"
+ TypeLibraryName="$(InputName).tlb"
+ OutputDirectory="$(IntDir)"
+ HeaderFileName="$(InputName).h"
+ DLLDataFileName=""
+ InterfaceIdentifierFileName="$(InputName)_i.c"
+ ProxyFileName="$(InputName)_p.c"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ </Configuration>
+ <Configuration
+ Name="RelWithDebInfo|x64"
+ OutputDirectory="RelWithDebInfo"
+ IntermediateDirectory="ALL_BUILD.dir\RelWithDebInfo"
+ ConfigurationType="10"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre;"
+ ExceptionHandling="0"
+ PreprocessorDefinitions="HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"RelWithDebInfo\""
+ AssemblerListingLocation="RelWithDebInfo"
+ ObjectFile="$(IntDir)\"
+/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ AdditionalIncludeDirectories="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre;"
+ PreprocessorDefinitions="HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"RelWithDebInfo\""/>
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"RelWithDebInfo\""
+ MkTypLibCompatible="FALSE"
+ TargetEnvironment="3"
+ GenerateStublessProxies="TRUE"
+ TypeLibraryName="$(InputName).tlb"
+ OutputDirectory="$(IntDir)"
+ HeaderFileName="$(InputName).h"
+ DLLDataFileName=""
+ InterfaceIdentifierFileName="$(InputName)_i.c"
+ ProxyFileName="$(InputName)_p.c"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ </Configuration>
+ </Configurations>
+ <Files>
+ <File
+ RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\ALL_BUILD">
+ </File>
+ <File
+ RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\CMakeLists.txt">
+ <FileConfiguration
+ Name="Debug|x64">
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Building Custom Rule D:/Work/WinMerge/WinMerge_SVN/Externals/pcre/CMakeLists.txt"
+ CommandLine=""C:\Program Files\CMake 2.8\bin\cmake.exe" -HD:/Work/WinMerge/WinMerge_SVN/Externals/pcre -BD:/Work/WinMerge/WinMerge_SVN/Externals/pcre/Win64 --check-stamp-file CMakeFiles/generate.stamp"
+ AdditionalDependencies="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\CMakeLists.txt;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeSystem.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeCCompiler.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeCXXCompiler.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeSystemSpecificInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeGenericSystem.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\gcc.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\Windows.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\WindowsPaths.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\Windows-cl.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeCPlatform.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeCXXPlatform.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\cl.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeRCCompiler.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeRCInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCommonLanguageInclude.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCXXInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCommonLanguageInclude.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\FindBZip2.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\cmake\FindPackageHandleStandardArgs.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\FindZLIB.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\cmake\FindPackageHandleStandardArgs.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\cmake\FindReadline.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\cmake\FindPackageHandleStandardArgs.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckIncludeFile.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckIncludeFileCXX.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckFunctionExists.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckTypeSize.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckIncludeFile.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\config-cmake.h.in;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre.h.generic;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_stringpiece.h.in;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcrecpparg.h.in;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_chartables.c.dist;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\CMakeLists.txt;"
+ Outputs="CMakeFiles\generate.stamp"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64">
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Building Custom Rule D:/Work/WinMerge/WinMerge_SVN/Externals/pcre/CMakeLists.txt"
+ CommandLine=""C:\Program Files\CMake 2.8\bin\cmake.exe" -HD:/Work/WinMerge/WinMerge_SVN/Externals/pcre -BD:/Work/WinMerge/WinMerge_SVN/Externals/pcre/Win64 --check-stamp-file CMakeFiles/generate.stamp"
+ AdditionalDependencies="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\CMakeLists.txt;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeSystem.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeCCompiler.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeCXXCompiler.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeSystemSpecificInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeGenericSystem.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\gcc.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\Windows.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\WindowsPaths.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\Windows-cl.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeCPlatform.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeCXXPlatform.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\cl.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeRCCompiler.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeRCInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCommonLanguageInclude.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCXXInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCommonLanguageInclude.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\FindBZip2.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\cmake\FindPackageHandleStandardArgs.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\FindZLIB.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\cmake\FindPackageHandleStandardArgs.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\cmake\FindReadline.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\cmake\FindPackageHandleStandardArgs.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckIncludeFile.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckIncludeFileCXX.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckFunctionExists.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckTypeSize.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckIncludeFile.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\config-cmake.h.in;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre.h.generic;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_stringpiece.h.in;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcrecpparg.h.in;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_chartables.c.dist;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\CMakeLists.txt;"
+ Outputs="CMakeFiles\generate.stamp"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="MinSizeRel|x64">
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Building Custom Rule D:/Work/WinMerge/WinMerge_SVN/Externals/pcre/CMakeLists.txt"
+ CommandLine=""C:\Program Files\CMake 2.8\bin\cmake.exe" -HD:/Work/WinMerge/WinMerge_SVN/Externals/pcre -BD:/Work/WinMerge/WinMerge_SVN/Externals/pcre/Win64 --check-stamp-file CMakeFiles/generate.stamp"
+ AdditionalDependencies="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\CMakeLists.txt;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeSystem.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeCCompiler.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeCXXCompiler.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeSystemSpecificInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeGenericSystem.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\gcc.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\Windows.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\WindowsPaths.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\Windows-cl.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeCPlatform.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeCXXPlatform.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\cl.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeRCCompiler.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeRCInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCommonLanguageInclude.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCXXInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCommonLanguageInclude.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\FindBZip2.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\cmake\FindPackageHandleStandardArgs.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\FindZLIB.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\cmake\FindPackageHandleStandardArgs.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\cmake\FindReadline.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\cmake\FindPackageHandleStandardArgs.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckIncludeFile.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckIncludeFileCXX.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckFunctionExists.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckTypeSize.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckIncludeFile.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\config-cmake.h.in;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre.h.generic;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_stringpiece.h.in;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcrecpparg.h.in;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_chartables.c.dist;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\CMakeLists.txt;"
+ Outputs="CMakeFiles\generate.stamp"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="RelWithDebInfo|x64">
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Building Custom Rule D:/Work/WinMerge/WinMerge_SVN/Externals/pcre/CMakeLists.txt"
+ CommandLine=""C:\Program Files\CMake 2.8\bin\cmake.exe" -HD:/Work/WinMerge/WinMerge_SVN/Externals/pcre -BD:/Work/WinMerge/WinMerge_SVN/Externals/pcre/Win64 --check-stamp-file CMakeFiles/generate.stamp"
+ AdditionalDependencies="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\CMakeLists.txt;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeSystem.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeCCompiler.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeCXXCompiler.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeSystemSpecificInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeGenericSystem.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\gcc.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\Windows.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\WindowsPaths.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\Windows-cl.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeCPlatform.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeCXXPlatform.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\cl.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeRCCompiler.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeRCInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCommonLanguageInclude.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCXXInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCommonLanguageInclude.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\FindBZip2.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\cmake\FindPackageHandleStandardArgs.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\FindZLIB.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\cmake\FindPackageHandleStandardArgs.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\cmake\FindReadline.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\cmake\FindPackageHandleStandardArgs.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckIncludeFile.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckIncludeFileCXX.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckFunctionExists.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckTypeSize.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckIncludeFile.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\config-cmake.h.in;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre.h.generic;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_stringpiece.h.in;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcrecpparg.h.in;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_chartables.c.dist;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\CMakeLists.txt;"
+ Outputs="CMakeFiles\generate.stamp"/>
+ </FileConfiguration>
+ </File>
+ <Filter
+ Name="CMake Rules"
+ Filter="">
+ <File
+ RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\ALL_BUILD.rule">
+ <FileConfiguration
+ Name="Debug|x64">
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Build all projects"
+ CommandLine=""
+ AdditionalDependencies="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\ALL_BUILD.rule"
+ Outputs="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\ALL_BUILD"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64">
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Build all projects"
+ CommandLine=""
+ AdditionalDependencies="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\ALL_BUILD.rule"
+ Outputs="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\ALL_BUILD"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="MinSizeRel|x64">
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Build all projects"
+ CommandLine=""
+ AdditionalDependencies="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\ALL_BUILD.rule"
+ Outputs="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\ALL_BUILD"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="RelWithDebInfo|x64">
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Build all projects"
+ CommandLine=""
+ AdditionalDependencies="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\ALL_BUILD.rule"
+ Outputs="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\ALL_BUILD"/>
+ </FileConfiguration>
+ </File>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
Property changes on: trunk/Externals/pcre/Win64/ALL_BUILD.vcproj
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: trunk/Externals/pcre/Win64/CMakeCache.txt
===================================================================
--- trunk/Externals/pcre/Win64/CMakeCache.txt (rev 0)
+++ trunk/Externals/pcre/Win64/CMakeCache.txt 2009-12-31 20:10:44 UTC (rev 7077)
@@ -0,0 +1,448 @@
+# This is the CMakeCache file.
+# For build in directory: d:/Work/WinMerge/WinMerge_SVN/Externals/pcre/Win64
+# It was generated by CMake: C:/Program Files/CMake 2.8/bin/cmake.exe
+# You can edit this file to change values found and used by cmake.
+# If you do not want to change any of the values, simply exit the editor.
+# If you do want to change a value, simply edit, save, and exit the editor.
+# The syntax for the file is as follows:
+# KEY:TYPE=VALUE
+# KEY is the name of a variable in the cache.
+# TYPE is a hint to GUI's for the type of VALUE, DO NOT EDIT TYPE!.
+# VALUE is the current value for the KEY.
+
+########################
+# EXTERNAL cache entries
+########################
+
+//Build shared libraries instead of static ones.
+BUILD_SHARED_LIBS:BOOL=ON
+
+//Path to a file.
+BZIP2_INCLUDE_DIR:PATH=BZIP2_INCLUDE_DIR-NOTFOUND
+
+//Path to a library.
+BZIP2_LIBRARIES:FILEPATH=BZIP2_LIBRARIES-NOTFOUND
+
+//For backwards compatibility, what version of CMake commands and
+// syntax should this version of CMake try to support.
+CMAKE_BACKWARDS_COMPATIBILITY:STRING=2.4
+
+//Semicolon separated list of supported configuration types, only
+// supports Debug, Release, MinSizeRel, and RelWithDebInfo, anything
+// else will be ignored.
+CMAKE_CONFIGURATION_TYPES:STRING=Debug;Release;MinSizeRel;RelWithDebInfo
+
+//C++ compiler
+CMAKE_CXX_COMPILER:FILEPATH=cl
+
+//Flags used by the compiler during all build types.
+CMAKE_CXX_FLAGS:STRING= /DWIN32 /D_WINDOWS /W3 /Zm1000 /EHsc /GR
+
+//Flags used by the compiler during debug builds.
+CMAKE_CXX_FLAGS_DEBUG:STRING=/D_DEBUG /MDd /Zi /Ob0 /Od /RTC1
+
+//Flags used by the compiler during release minsize builds.
+CMAKE_CXX_FLAGS_MINSIZEREL:STRING=/MD /O1 /Ob1 /D NDEBUG
+
+//Flags used by the compiler during release builds (/MD /Ob1 /Oi
+// /Ot /Oy /Gs will produce slightly less optimized but smaller
+// files).
+CMAKE_CXX_FLAGS_RELEASE:STRING=/MD /O2 /Ob2 /D NDEBUG
+
+//Flags used by the compiler during Release with Debug Info builds.
+CMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING=/MD /Zi /O2 /Ob1 /D NDEBUG
+
+//Libraries linked by defalut with all C++ applications.
+CMAKE_CXX_STANDARD_LIBRARIES:STRING='kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib '
+
+//C compiler
+CMAKE_C_COMPILER:FILEPATH=cl
+
+//Flags used by the compiler during all build types.
+CMAKE_C_FLAGS:STRING= /DWIN32 /D_WINDOWS /W3 /Zm1000
+
+//Flags used by the compiler during debug builds.
+CMAKE_C_FLAGS_DEBUG:STRING=/D_DEBUG /MDd /Zi /Ob0 /Od /RTC1
+
+//Flags used by the compiler during release minsize builds.
+CMAKE_C_FLAGS_MINSIZEREL:STRING=/MD /O1 /Ob1 /D NDEBUG
+
+//Flags used by the compiler during release builds (/MD /Ob1 /Oi
+// /Ot /Oy /Gs will produce slightly less optimized but smaller
+// files).
+CMAKE_C_FLAGS_RELEASE:STRING=/MD /O2 /Ob2 /D NDEBUG
+
+//Flags used by the compiler during Release with Debug Info builds.
+CMAKE_C_FLAGS_RELWITHDEBINFO:STRING=/MD /Zi /O2 /Ob1 /D NDEBUG
+
+//Libraries linked by defalut with all C applications.
+CMAKE_C_STANDARD_LIBRARIES:STRING='kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib '
+
+//Flags used by the linker.
+CMAKE_EXE_LINKER_FLAGS:STRING= /STACK:10000000 /machine:x64
+
+//Flags used by the linker during debug builds.
+CMAKE_EXE_LINKER_FLAGS_DEBUG:STRING=/debug /INCREMENTAL:YES
+
+//Flags used by the linker during release minsize builds.
+CMAKE_EXE_LINKER_FLAGS_MINSIZEREL:STRING=/INCREMENTAL:NO
+
+//Flags used by the linker during release builds.
+CMAKE_EXE_LINKER_FLAGS_RELEASE:STRING=/INCREMENTAL:NO
+
+//Flags used by the linker during Release with Debug Info builds.
+CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING=/debug /INCREMENTAL:YES
+
+//Install path prefix, prepended onto install directories.
+CMAKE_INSTALL_PREFIX:PATH=C:/Program Files/PCRE
+
+//Path to a program.
+CMAKE_LINKER:FILEPATH=CMAKE_LINKER-NOTFOUND
+
+//make program
+CMAKE_MAKE_PROGRAM:FILEPATH=C:/PROGRA~1/MICROS~4/Common7/IDE/devenv.com
+
+//Flags used by the linker during the creation of modules.
+CMAKE_MODULE_LINKER_FLAGS:STRING= /STACK:10000000 /machine:x64
+
+//Flags used by the linker during debug builds.
+CMAKE_MODULE_LINKER_FLAGS_DEBUG:STRING=/debug /INCREMENTAL:YES
+
+//Flags used by the linker during release minsize builds.
+CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL:STRING=/INCREMENTAL:NO
+
+//Flags used by the linker during release builds.
+CMAKE_MODULE_LINKER_FLAGS_RELEASE:STRING=/INCREMENTAL:NO
+
+//Flags used by the linker during Release with Debug Info builds.
+CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING=/debug /INCREMENTAL:YES
+
+//Value Computed by CMake
+CMAKE_PROJECT_NAME:STATIC=PCRE
+
+//RC compiler
+CMAKE_RC_COMPILER:FILEPATH=rc
+
+//Flags for Fortran compiler.
+CMAKE_RC_FLAGS:STRING=' '
+
+//Flags used by the linker during the creation of dll's.
+CMAKE_SHARED_LINKER_FLAGS:STRING= /STACK:10000000 /machine:x64
+
+//Flags used by the linker during debug builds.
+CMAKE_SHARED_LINKER_FLAGS_DEBUG:STRING=/debug /INCREMENTAL:YES
+
+//Flags used by the linker during release minsize builds.
+CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL:STRING=/INCREMENTAL:NO
+
+//Flags used by the linker during release builds.
+CMAKE_SHARED_LINKER_FLAGS_RELEASE:STRING=/INCREMENTAL:NO
+
+//Flags used by the linker during Release with Debug Info builds.
+CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO:STRING=/debug /INCREMENTAL:YES
+
+//If set, runtime paths are not added when using shared libraries.
+CMAKE_SKIP_RPATH:BOOL=OFF
+
+//If true, cmake will use relative paths in makefiles and projects.
+CMAKE_USE_RELATIVE_PATHS:BOOL=OFF
+
+//If this value is on, makefiles will be generated without the
+// .SILENT directive, and all commands will be echoed to the console
+// during the make. This is useful for debugging only. With Visual
+// Studio IDE projects all commands are done without /nologo.
+CMAKE_VERBOSE_MAKEFILE:BOOL=OFF
+
+//Single output directory for building all executables.
+EXECUTABLE_OUTPUT_PATH:PATH=
+
+//Single output directory for building all libraries.
+LIBRARY_OUTPUT_PATH:PATH=
+
+//Value Computed by CMake
+PCRE_BINARY_DIR:STATIC=D:/Work/WinMerge/WinMerge_SVN/Externals/pcre/Win64
+
+//Build the PCRE C++ library (pcrecpp).
+PCRE_BUILD_PCRECPP:BOOL=ON
+
+//Build pcregrep
+PCRE_BUILD_PCREGREP:BOOL=ON
+
+//Build the tests
+PCRE_BUILD_TESTS:BOOL=ON
+
+//Use EBCDIC coding instead of ASCII. (This is rarely used outside
+// of mainframe systems)
+PCRE_EBCDIC:BOOL=OFF
+
+//Internal link size (2, 3 or 4 allowed). See LINK_SIZE in config.h.in
+// for details.
+PCRE_LINK_SIZE:STRING=2
+
+//Default limit on internal looping. See MATCH_LIMIT in config.h.in
+// for details.
+PCRE_MATCH_LIMIT:STRING=10000000
+
+//Default limit on internal recursion. See MATCH_LIMIT_RECURSION
+// in config.h.in for details.
+PCRE_MATCH_LIMIT_RECURSION:STRING=MATCH_LIMIT
+
+//What to recognize as a newline (one of CR, LF, CRLF, ANY, ANYCRLF).
+PCRE_NEWLINE:STRING=ANY
+
+//If ON, then don't use stack recursion when matching. See NO_RECURSE
+// in config.h.in for details.
+PCRE_NO_RECURSE:BOOL=OFF
+
+//Threshold for malloc() usage. See POSIX_MALLOC_THRESHOLD in config.h.in
+// for details.
+PCRE_POSIX_MALLOC_THRESHOLD:STRING=10
+
+//Rebuild char tables
+PCRE_REBUILD_CHARTABLES:BOOL=OFF
+
+//Show the final configuration report
+PCRE_SHOW_REPORT:BOOL=ON
+
+//Value Computed by CMake
+PCRE_SOURCE_DIR:STATIC=D:/Work/WinMerge/WinMerge_SVN/Externals/pcre
+
+//ON=Backslash-R matches only LF CR and CRLF, OFF=Backslash-R matches
+// all Unicode Linebreaks
+PCRE_SUPPORT_BSR_ANYCRLF:BOOL=OFF
+
+//Enable support for Unicode properties. (If set, UTF-8 support
+// will be enabled as well)
+PCRE_SUPPORT_UNICODE_PROPERTIES:BOOL=OFF
+
+//Enable support for the Unicode UTF-8 encoding.
+PCRE_SUPPORT_UTF8:BOOL=ON
+
+//Path to a file.
+READLINE_INCLUDE_DIR:PATH=READLINE_INCLUDE_DIR-NOTFOUND
+
+//Path to a library.
+READLINE_LIBRARY:FILEPATH=READLINE_LIBRARY-NOTFOUND
+
+//Path to a file.
+ZLIB_INCLUDE_DIR:PATH=ZLIB_INCLUDE_DIR-NOTFOUND
+
+//Path to a library.
+ZLIB_LIBRARY:FILEPATH=ZLIB_LIBRARY-NOTFOUND
+
+//Dependencies for target
+pcre_LIB_DEPENDS:STATIC=
+
+//Dependencies for the target
+pcrecpp_LIB_DEPENDS:STATIC=general;pcre;
+
+//Dependencies for the target
+pcreposix_LIB_DEPENDS:STATIC=general;pcre;
+
+
+########################
+# INTERNAL cache entries
+########################
+
+//Stored GUID
+ALL_BUILD_GUID_CMAKE:INTERNAL=621A3727-83D9-4122-AF50-887943250F0E
+//ADVANCED property for variable: BZIP2_INCLUDE_DIR
+BZIP2_INCLUDE_DIR-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: BZIP2_LIBRARIES
+BZIP2_LIBRARIES-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_BUILD_TOOL
+CMAKE_BUILD_TOOL-ADVANCED:INTERNAL=1
+//What is the target build tool cmake is generating for.
+CMAKE_BUILD_TOOL:INTERNAL=C:/PROGRA~1/MICROS~4/Common7/IDE/devenv.com
+//This is the directory where this CMakeCache.txt was created
+CMAKE_CACHEFILE_DIR:INTERNAL=d:/Work/WinMerge/WinMerge_SVN/Externals/pcre/Win64
+//Major version of cmake used to create the current loaded cache
+CMAKE_CACHE_MAJOR_VERSION:INTERNAL=2
+//Minor version of cmake used to create the current loaded cache
+CMAKE_CACHE_MINOR_VERSION:INTERNAL=8
+//Patch version of cmake used to create the current loaded cache
+CMAKE_CACHE_PATCH_VERSION:INTERNAL=0
+//Path to CMake executable.
+CMAKE_COMMAND:INTERNAL=C:/Program Files/CMake 2.8/bin/cmake.exe
+//ADVANCED property for variable: CMAKE_CONFIGURATION_TYPES
+CMAKE_CONFIGURATION_TYPES-ADVANCED:INTERNAL=1
+//Path to cpack program executable.
+CMAKE_CPACK_COMMAND:INTERNAL=C:/Program Files/CMake 2.8/bin/cpack.exe
+//Path to ctest program executable.
+CMAKE_CTEST_COMMAND:INTERNAL=C:/Program Files/CMake 2.8/bin/ctest.exe
+//ADVANCED property for variable: CMAKE_CXX_COMPILER
+CMAKE_CXX_COMPILER-ADVANCED:INTERNAL=1
+CMAKE_CXX_COMPILER_WORKS:INTERNAL=1
+//ADVANCED property for variable: CMAKE_CXX_FLAGS
+CMAKE_CXX_FLAGS-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_CXX_FLAGS_DEBUG
+CMAKE_CXX_FLAGS_DEBUG-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_CXX_FLAGS_MINSIZEREL
+CMAKE_CXX_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_CXX_FLAGS_RELEASE
+CMAKE_CXX_FLAGS_RELEASE-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_CXX_FLAGS_RELWITHDEBINFO
+CMAKE_CXX_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_CXX_STANDARD_LIBRARIES
+CMAKE_CXX_STANDARD_LIBRARIES-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_C_COMPILER
+CMAKE_C_COMPILER-ADVANCED:INTERNAL=1
+CMAKE_C_COMPILER_WORKS:INTERNAL=1
+//ADVANCED property for variable: CMAKE_C_FLAGS
+CMAKE_C_FLAGS-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_C_FLAGS_DEBUG
+CMAKE_C_FLAGS_DEBUG-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_C_FLAGS_MINSIZEREL
+CMAKE_C_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_C_FLAGS_RELEASE
+CMAKE_C_FLAGS_RELEASE-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_C_FLAGS_RELWITHDEBINFO
+CMAKE_C_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_C_STANDARD_LIBRARIES
+CMAKE_C_STANDARD_LIBRARIES-ADVANCED:INTERNAL=1
+//Result of TRY_COMPILE
+CMAKE_DETERMINE_CXX_ABI_COMPILED:INTERNAL=TRUE
+//Result of TRY_COMPILE
+CMAKE_DETERMINE_C_ABI_COMPILED:INTERNAL=TRUE
+//Path to cache edit program executable.
+CMAKE_EDIT_COMMAND:INTERNAL=C:/Program Files/CMake 2.8/bin/cmake-gui.exe
+//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS
+CMAKE_EXE_LINKER_FLAGS-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS_DEBUG
+CMAKE_EXE_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS_MINSIZEREL
+CMAKE_EXE_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS_RELEASE
+CMAKE_EXE_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO
+CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
+//Name of generator.
+CMAKE_GENERATOR:INTERNAL=Visual Studio 8 2005 Win64
+//Start directory with the top level CMakeLists.txt file for this
+// project
+CMAKE_HOME_DIRECTORY:INTERNAL=D:/Work/WinMerge/WinMerge_SVN/Externals/pcre
+//ADVANCED property for variable: CMAKE_LINKER
+CMAKE_LINKER-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_MAKE_PROGRAM
+CMAKE_MAKE_PROGRAM-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS
+CMAKE_MODULE_LINKER_FLAGS-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS_DEBUG
+CMAKE_MODULE_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL
+CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS_RELEASE
+CMAKE_MODULE_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO
+CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
+//number of local generators
+CMAKE_NUMBER_OF_LOCAL_GENERATORS:INTERNAL=1
+//ADVANCED property for variable: CMAKE_RC_COMPILER
+CMAKE_RC_COMPILER-ADVANCED:INTERNAL=1
+CMAKE_RC_COMPILER_WORKS:INTERNAL=1
+//ADVANCED property for variable: CMAKE_RC_FLAGS
+CMAKE_RC_FLAGS-ADVANCED:INTERNAL=1
+//Path to CMake installation.
+CMAKE_ROOT:INTERNAL=C:/Program Files/CMake 2.8/share/cmake-2.8
+//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS
+CMAKE_SHARED_LINKER_FLAGS-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_DEBUG
+CMAKE_SHARED_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL
+CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_RELEASE
+CMAKE_SHARED_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO
+CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_SKIP_RPATH
+CMAKE_SKIP_RPATH-ADVANCED:INTERNAL=1
+//Suppress Warnings that are meant for the author of the CMakeLists.txt
+// files.
+CMAKE_SUPPRESS_DEVELOPER_WARNINGS:INTERNAL=FALSE
+//ADVANCED property for variable: CMAKE_USE_RELATIVE_PATHS
+CMAKE_USE_RELATIVE_PATHS-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_VERBOSE_MAKEFILE
+CMAKE_VERBOSE_MAKEFILE-ADVANCED:INTERNAL=1
+//Stored GUID
+EDIT_CACHE_GUID_CMAKE:INTERNAL=EC5E8C0D-258F-4270-8CEB-9DD3F4C22E67
+//Have function bcopy
+HAVE_BCOPY:INTERNAL=
+//Have include bits/type_traits.h
+HAVE_BITS_TYPE_TRAITS_H:INTERNAL=
+//Have include dirent.h
+HAVE_DIRENT_H:INTERNAL=
+//Result of TRY_COMPILE
+HAVE_LONG_LONG:INTERNAL=TRUE
+//Have function memmove
+HAVE_MEMMOVE:INTERNAL=1
+//Have include stddef.h
+HAVE_STDDEF_H:INTERNAL=1
+//Have include stdint.h
+HAVE_STDINT_H:INTERNAL=
+//Have function strerror
+HAVE_STRERROR:INTERNAL=1
+//Have function strtoll
+HAVE_STRTOLL:INTERNAL=
+//Have function strtoq
+HAVE_STRTOQ:INTERNAL=
+//Have include sys/stat.h
+HAVE_SYS_STAT_H:INTERNAL=1
+//Have include sys/types.h
+HAVE_SYS_TYPES_H:INTERNAL=1
+//Have include type_traits.h
+HAVE_TYPE_TRAITS_H:INTERNAL=
+//Have include unistd.h
+HAVE_UNISTD_H:INTERNAL=
+//Result of TRY_COMPILE
+HAVE_UNSIGNED_LONG_LONG:INTERNAL=TRUE
+//Have include windows.h
+HAVE_WINDOWS_H:INTERNAL=1
+//Have function _strtoi64
+HAVE__STRTOI64:INTERNAL=1
+//Stored GUID
+INSTALL_GUID_CMAKE:INTERNAL=EDD8F512-863C-48DA-8184-03F4DEB91988
+//Result of CHECK_TYPE_SIZE
+LONG_LONG:INTERNAL=8
+//Stored GUID
+PACKAGE_GUID_CMAKE:INTERNAL=24C815A3-C03C-4E50-BF15-D6B1995E4422
+//ADVANCED property for variable: READLINE_INCLUDE_DIR
+READLINE_INCLUDE_DIR-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: READLINE_LIBRARY
+READLINE_LIBRARY-ADVANCED:INTERNAL=1
+//Stored GUID
+REBUILD_CACHE_GUID_CMAKE:INTERNAL=F868F11E-ACDF-420A-A174-A2A567A59103
+//Stored GUID
+RUN_TESTS_GUID_CMAKE:INTERNAL=558A1FE8-BB90-4238-96BD-3BFFD6E11D7E
+//Stored GUID
+SG_Filter_CMake Rules_GUID_CMAKE:INTERNAL=CAF4013E-5050-4043-B2E3-EAD6C3811B77
+//Stored GUID
+SG_Filter_Header Files_GUID_CMAKE:INTERNAL=DCED89F2-30CB-47F2-8560-781634CA6EAD
+//Stored GUID
+SG_Filter_Resources_GUID_CMAKE:INTERNAL=9898AACE-1B50-4AD7-81B9-FA6C6B5A4DAD
+//Stored GUID
+SG_Filter_Source Files_GUID_CMAKE:INTERNAL=01A13B06-537A-4067-9757-A9C58872762C
+//Result of CHECK_TYPE_SIZE
+UNSIGNED_LONG_LONG:INTERNAL=8
+//Stored GUID
+ZERO_CHECK_GUID_CMAKE:INTERNAL=C345AEA0-631F-43FE-9759-6695FD3A2F91
+//ADVANCED property for variable: ZLIB_INCLUDE_DIR
+ZLIB_INCLUDE_DIR-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: ZLIB_LIBRARY
+ZLIB_LIBRARY-ADVANCED:INTERNAL=1
+//Stored GUID
+pcre_GUID_CMAKE:INTERNAL=A316CDC1-94DD-4B87-816F-F8747568DA1D
+//Stored GUID
+pcre_scanner_unittest_GUID_CMAKE:INTERNAL=D8EDF6D8-72F2-4368-B38C-89010A847CEC
+//Stored GUID
+pcre_stringpiece_unittest_GUID_CMAKE:INTERNAL=3788A3FD-CEDB-4D52-A266-4AED33A720E9
+//Stored GUID
+pcrecpp_GUID_CMAKE:INTERNAL=5DA66217-CB29-4F2F-9AFE-DAF855F38DAD
+//Stored GUID
+pcrecpp_unittest_GUID_CMAKE:INTERNAL=CCA78B5F-F1D4-4AD1-B9E8-4439E7057A8B
+//Stored GUID
+pcregrep_GUID_CMAKE:INTERNAL=C7BA00A5-BB76-4416-8ACC-15E3DDAA50F4
+//Stored GUID
+pcreposix_GUID_CMAKE:INTERNAL=FA005F1D-26E3-462C-BF05-509362D5CF34
+//Stored GUID
+pcretest_GUID_CMAKE:INTERNAL=11A6D251-43EF-4786-89D0-1CC633C628C8
+
Property changes on: trunk/Externals/pcre/Win64/CMakeCache.txt
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Property changes on: trunk/Externals/pcre/Win64/CMakeFiles
___________________________________________________________________
Added: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Added: bugtraq:logregex
+ (\d{6,})
Added: trunk/Externals/pcre/Win64/CMakeFiles/ALL_BUILD.rule
===================================================================
--- trunk/Externals/pcre/Win64/CMakeFiles/ALL_BUILD.rule (rev 0)
+++ trunk/Externals/pcre/Win64/CMakeFiles/ALL_BUILD.rule 2009-12-31 20:10:44 UTC (rev 7077)
@@ -0,0 +1 @@
+Artificial dependency for a custom command.
Property changes on: trunk/Externals/pcre/Win64/CMakeFiles/ALL_BUILD.rule
___________________________________________________________________
Added: svn:eol-style
+ native
Added: trunk/Externals/pcre/Win64/CMakeFiles/CMakeCCompiler.cmake
===================================================================
--- trunk/Externals/pcre/Win64/CMakeFiles/CMakeCCompiler.cmake (rev 0)
+++ trunk/Externals/pcre/Win64/CMakeFiles/CMakeCCompiler.cmake 2009-12-31 20:10:44 UTC (rev 7077)
@@ -0,0 +1,41 @@
+SET(CMAKE_C_COMPILER "cl")
+SET(CMAKE_C_COMPILER_ARG1 "")
+SET(CMAKE_C_COMPILER_ID "")
+SET(CMAKE_C_PLATFORM_ID "Windows")
+SET(CMAKE_AR "")
+SET(CMAKE_RANLIB "")
+SET(CMAKE_COMPILER_IS_GNUCC )
+SET(CMAKE_C_COMPILER_LOADED 1)
+SET(CMAKE_COMPILER_IS_MINGW )
+SET(CMAKE_COMPILER_IS_CYGWIN )
+IF(CMAKE_COMPILER_IS_CYGWIN)
+ SET(CYGWIN 1)
+ SET(UNIX 1)
+ENDIF(CMAKE_COMPILER_IS_CYGWIN)
+
+SET(CMAKE_C_COMPILER_ENV_VAR "CC")
+
+IF(CMAKE_COMPILER_IS_MINGW)
+ SET(MINGW 1)
+ENDIF(CMAKE_COMPILER_IS_MINGW)
+SET(CMAKE_C_COMPILER_ID_RUN 1)
+SET(CMAKE_C_SOURCE_FILE_EXTENSIONS c)
+SET(CMAKE_C_IGNORE_EXTENSIONS h;H;o;O;obj;OBJ;def;DEF;rc;RC)
+SET(CMAKE_C_LINKER_PREFERENCE 10)
+
+# Save compiler ABI information.
+SET(CMAKE_C_SIZEOF_DATA_PTR "8")
+SET(CMAKE_C_COMPILER_ABI "")
+
+IF(CMAKE_C_SIZEOF_DATA_PTR)
+ SET(CMAKE_SIZEOF_VOID_P "${CMAKE_C_SIZEOF_DATA_PTR}")
+ENDIF(CMAKE_C_SIZEOF_DATA_PTR)
+
+IF(CMAKE_C_COMPILER_ABI)
+ SET(CMAKE_INTERNAL_PLATFORM_ABI "${CMAKE_C_COMPILER_ABI}")
+ENDIF(CMAKE_C_COMPILER_ABI)
+
+SET(CMAKE_C_HAS_ISYSROOT "")
+
+SET(CMAKE_C_IMPLICIT_LINK_LIBRARIES "")
+SET(CMAKE_C_IMPLICIT_LINK_DIRECTORIES "")
Property changes on: trunk/Externals/pcre/Win64/CMakeFiles/CMakeCCompiler.cmake
___________________________________________________________________
Added: svn:eol-style
+ native
Added: trunk/Externals/pcre/Win64/CMakeFiles/CMakeCPlatform.cmake
===================================================================
--- trunk/Externals/pcre/Win64/CMakeFiles/CMakeCPlatform.cmake (rev 0)
+++ trunk/Externals/pcre/Win64/CMakeFiles/CMakeCPlatform.cmake 2009-12-31 20:10:44 UTC (rev 7077)
@@ -0,0 +1,13 @@
+SET(CMAKE_VC_COMPILER_TESTS_RUN 1)
+SET(CMAKE_COMPILER_SUPPORTS_PDBTYPE )
+SET(CMAKE_COMPILER_2005 1)
+SET(CMAKE_USING_VC_FREE_TOOLS )
+SET(CMAKE_CL_64 1)
+SET(MSVC60 )
+SET(MSVC70 )
+SET(MSVC71 )
+SET(MSVC80 1)
+SET(MSVC90 )
+SET(MSVC_IDE 1)
+SET(MSVC_VERSION 1400)
+SET(WIN32 1)
Property changes on: trunk/Externals/pcre/Win64/CMakeFiles/CMakeCPlatform.cmake
___________________________________________________________________
Added: svn:eol-style
+ native
Added: trunk/Externals/pcre/Win64/CMakeFiles/CMakeCXXCompiler.cmake
===================================================================
--- trunk/Externals/pcre/Win64/CMakeFiles/CMakeCXXCompiler.cmake (rev 0)
+++ trunk/Externals/pcre/Win64/CMakeFiles/CMakeCXXCompiler.cmake 2009-12-31 20:10:44 UTC (rev 7077)
@@ -0,0 +1,42 @@
+SET(CMAKE_CXX_COMPILER "cl")
+SET(CMAKE_CXX_COMPILER_ARG1 "")
+SET(CMAKE_CXX_COMPILER_ID "")
+SET(CMAKE_CXX_PLATFORM_ID "Windows")
+SET(CMAKE_AR "")
+SET(CMAKE_RANLIB "")
+SET(CMAKE_COMPILER_IS_GNUCXX )
+SET(CMAKE_CXX_COMPILER_LOADED 1)
+SET(CMAKE_COMPILER_IS_MINGW )
+SET(CMAKE_COMPILER_IS_CYGWIN )
+IF(CMAKE_COMPILER_IS_CYGWIN)
+ SET(CYGWIN 1)
+ SET(UNIX 1)
+ENDIF(CMAKE_COMPILER_IS_CYGWIN)
+
+SET(CMAKE_CXX_COMPILER_ENV_VAR "CXX")
+
+IF(CMAKE_COMPILER_IS_MINGW)
+ SET(MINGW 1)
+ENDIF(CMAKE_COMPILER_IS_MINGW)
+SET(CMAKE_CXX_COMPILER_ID_RUN 1)
+SET(CMAKE_CXX_IGNORE_EXTENSIONS inl;h;H;o;O;obj;OBJ;def;DEF;rc;RC)
+SET(CMAKE_CXX_SOURCE_FILE_EXTENSIONS C;M;c++;cc;cpp;cxx;m;mm)
+SET(CMAKE_CXX_LINKER_PREFERENCE 30)
+SET(CMAKE_CXX_LINKER_PREFERENCE_PROPAGATES 1)
+
+# Save compiler ABI information.
+SET(CMAKE_CXX_SIZEOF_DATA_PTR "8")
+SET(CMAKE_CXX_COMPILER_ABI "")
+
+IF(CMAKE_CXX_SIZEOF_DATA_PTR)
+ SET(CMAKE_SIZEOF_VOID_P "${CMAKE_CXX_SIZEOF_DATA_PTR}")
+ENDIF(CMAKE_CXX_SIZEOF_DATA_PTR)
+
+IF(CMAKE_CXX_COMPILER_ABI)
+ SET(CMAKE_INTERNAL_PLATFORM_ABI "${CMAKE_CXX_COMPILER_ABI}")
+ENDIF(CMAKE_CXX_COMPILER_ABI)
+
+SET(CMAKE_CXX_HAS_ISYSROOT "")
+
+SET(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "")
+SET(CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES "")
Property changes on: trunk/Externals/pcre/Win64/CMakeFiles/CMakeCXXCompiler.cmake
___________________________________________________________________
Added: svn:eol-style
+ native
Added: trunk/Externals/pcre/Win64/CMakeFiles/CMakeCXXPlatform.cmake
===================================================================
--- trunk/Externals/pcre/Win64/CMakeFiles/CMakeCXXPlatform.cmake (rev 0)
+++ trunk/Externals/pcre/Win64/CMakeFiles/CMakeCXXPlatform.cmake 2009-12-31 20:10:44 UTC (rev 7077)
@@ -0,0 +1,13 @@
+SET(CMAKE_VC_COMPILER_TESTS_RUN 1)
+SET(CMAKE_COMPILER_SUPPORTS_PDBTYPE )
+SET(CMAKE_COMPILER_2005 1)
+SET(CMAKE_USING_VC_FREE_TOOLS )
+SET(CMAKE_CL_64 1)
+SET(MSVC60 )
+SET(MSVC70 )
+SET(MSVC71 )
+SET(MSVC80 1)
+SET(MSVC90 )
+SET(MSVC_IDE 1)
+SET(MSVC_VERSION 1400)
+SET(WIN32 1)
Property changes on: trunk/Externals/pcre/Win64/CMakeFiles/CMakeCXXPlatform.cmake
___________________________________________________________________
Added: svn:eol-style
+ native
Added: trunk/Externals/pcre/Win64/CMakeFiles/CMakeDetermineCompilerABI_C.bin
===================================================================
(Binary files differ)
Property changes on: trunk/Externals/pcre/Win64/CMakeFiles/CMakeDetermineCompilerABI_C.bin
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/Externals/pcre/Win64/CMakeFiles/CMakeDetermineCompilerABI_CXX.bin
===================================================================
(Binary files differ)
Property changes on: trunk/Externals/pcre/Win64/CMakeFiles/CMakeDetermineCompilerABI_CXX.bin
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/Externals/pcre/Win64/CMakeFiles/CMakeError.log
===================================================================
--- trunk/Externals/pcre/Win64/CMakeFiles/CMakeError.log (rev 0)
+++ trunk/Externals/pcre/Win64/CMakeFiles/CMakeError.log 2009-12-31 20:10:44 UTC (rev 7077)
@@ -0,0 +1,290 @@
+Determining if the include file dirent.h exists failed with the following output:
+Change Dir: D:/Work/WinMerge/WinMerge_SVN/Externals/pcre/Win64/CMakeFiles/CMakeTmp
+
+Run Build Command:C:\PROGRA~1\MICROS~4\Common7\IDE\devenv.com CMAKE_TRY_COMPILE.sln /build Debug /project cmTryCompileExec
+
+
+Microsoft (R) Visual Studio Version 8.0.50727.867.
+
+Copyright (C) Microsoft Corp 1984-2005. All rights reserved.
+
+1>------ Build started: Project: cmTryCompileExec, Configuration: Debug x64 ------
+
+1>Compiling...
+
+1>Microsoft (R) C/C++ Optimizing Compiler Version 14.00.50727.762 for x64
+
+1>Copyright (C) Microsoft Corporation. All rights reserved.
+
+1>cl /Od /D "WIN32" /D "_WINDOWS" /D "_DEBUG" /D "CMAKE_INTDIR=\"Debug\"" /D "_MBCS" /FD /RTC1 /MDd /Fo"cmTryCompileExec.dir\Debug\\" /Fd"D:/Work/WinMerge/WinMerge_SVN/Externals/pcre/Win64/CMakeFiles/CMakeTmp/Debug/cmTryCompileExec.pdb" /W3 /c /Zi /TC /Zm1000
+
+1> .\CheckIncludeFile.c
+
+1>CheckIncludeFile.c
+
+1>.\CheckIncludeFile.c(1) : fatal error C1083: Cannot open include file: 'dirent.h': No such file or directory
+
+1>Build log was saved at "file://d:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeTmp\cmTryCompileExec.dir\Debug\BuildLog.htm"
+
+1>cmTryCompileExec - 1 error(s), 0 warning(s)
+
+========== Build: 0 succeeded, 1 failed, 0 up-to-date, 0 skipped ==========
+
+
+
+Determining if the include file unistd.h exists failed with the following output:
+Change Dir: D:/Work/WinMerge/WinMerge_SVN/Externals/pcre/Win64/CMakeFiles/CMakeTmp
+
+Run Build Command:C:\PROGRA~1\MICROS~4\Common7\IDE\devenv.com CMAKE_TRY_COMPILE.sln /build Debug /project cmTryCompileExec
+
+
+Microsoft (R) Visual Studio Version 8.0.50727.867.
+
+Copyright (C) Microsoft Corp 1984-2005. All rights reserved.
+
+1>------ Build started: Project: cmTryCompileExec, Configuration: Debug x64 ------
+
+1>Compiling...
+
+1>Microsoft (R) C/C++ Optimizing Compiler Version 14.00.50727.762 for x64
+
+1>Copyright (C) Microsoft Corporation. All rights reserved.
+
+1>cl /Od /D "WIN32" /D "_WINDOWS" /D "_DEBUG" /D "CMAKE_INTDIR=\"Debug\"" /D "_MBCS" /FD /RTC1 /MDd /Fo"cmTryCompileExec.dir\Debug\\" /Fd"D:/Work/WinMerge/WinMerge_SVN/Externals/pcre/Win64/CMakeFiles/CMakeTmp/Debug/cmTryCompileExec.pdb" /W3 /c /Zi /TC /Zm1000
+
+1> .\CheckIncludeFile.c
+
+1>CheckIncludeFile.c
+
+1>.\CheckIncludeFile.c(1) : fatal error C1083: Cannot open include file: 'unistd.h': No such file or directory
+
+1>Build log was saved at "file://d:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeTmp\cmTryCompileExec.dir\Debug\BuildLog.htm"
+
+1>cmTryCompileExec - 1 error(s), 0 warning(s)
+
+========== Build: 0 succeeded, 1 failed, 0 up-to-date, 0 skipped ==========
+
+
+
+Determining if the include file type_traits.h exists failed with the following output:
+Change Dir: D:/Work/WinMerge/WinMerge_SVN/Externals/pcre/Win64/CMakeFiles/CMakeTmp
+
+Run Build Command:C:\PROGRA~1\MICROS~4\Common7\IDE\devenv.com CMAKE_TRY_COMPILE.sln /build Debug /project cmTryCompileExec
+
+
+Microsoft (R) Visual Studio Version 8.0.50727.867.
+
+Copyright (C) Microsoft Corp 1984-2005. All rights reserved.
+
+1>------ Build started: Project: cmTryCompileExec, Configuration: Debug x64 ------
+
+1>Compiling...
+
+1>Microsoft (R) C/C++ Optimizing Compiler Version 14.00.50727.762 for x64
+
+1>Copyright (C) Microsoft Corporation. All rights reserved.
+
+1>cl /Od /D "WIN32" /D "_WINDOWS" /D "_DEBUG" /D "CMAKE_INTDIR=\"Debug\"" /D "_MBCS" /FD /EHsc /RTC1 /MDd /Fo"cmTryCompileExec.dir\Debug\\" /Fd"D:/Work/WinMerge/WinMerge_SVN/Externals/pcre/Win64/CMakeFiles/CMakeTmp/Debug/cmTryCompileExec.pdb" /W3 /c /Zi /TP /Zm1000
+
+1> .\CheckIncludeFile.cxx
+
+1>CheckIncludeFile.cxx
+
+1>.\CheckIncludeFile.cxx(1) : fatal error C1083: Cannot open include file: 'type_traits.h': No such file or directory
+
+1>Build log was saved at "file://d:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeTmp\cmTryCompileExec.dir\Debug\BuildLog.htm"
+
+1>cmTryCompileExec - 1 error(s), 0 warning(s)
+
+========== Build: 0 succeeded, 1 failed, 0 up-to-date, 0 skipped ==========
+
+
+
+Determining if the include file bits/type_traits.h exists failed with the following output:
+Change Dir: D:/Work/WinMerge/WinMerge_SVN/Externals/pcre/Win64/CMakeFiles/CMakeTmp
+
+Run Build Command:C:\PROGRA~1\MICROS~4\Common7\IDE\devenv.com CMAKE_TRY_COMPILE.sln /build Debug /project cmTryCompileExec
+
+
+Microsoft (R) Visual Studio Version 8.0.50727.867.
+
+Copyright (C) Microsoft Corp 1984-2005. All rights reserved.
+
+1>------ Build started: Project: cmTryCompileExec, Configuration: Debug x64 ------
+
+1>Compiling...
+
+1>Microsoft (R) C/C++ Optimizing Compiler Version 14.00.50727.762 for x64
+
+1>Copyright (C) Microsoft Corporation. All rights reserved.
+
+1>cl /Od /D "WIN32" /D "_WINDOWS" /D "_DEBUG" /D "CMAKE_INTDIR=\"Debug\"" /D "_MBCS" /FD /EHsc /RTC1 /MDd /Fo"cmTryCompileExec.dir\Debug\\" /Fd"D:/Work/WinMerge/WinMerge_SVN/Externals/pcre/Win64/CMakeFiles/CMakeTmp/Debug/cmTryCompileExec.pdb" /W3 /c /Zi /TP /Zm1000
+
+1> .\CheckIncludeFile.cxx
+
+1>CheckIncludeFile.cxx
+
+1>.\CheckIncludeFile.cxx(1) : fatal error C1083: Cannot open include file: 'bits/type_traits.h': No such file or directory
+
+1>Build log was saved at "file://d:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeTmp\cmTryCompileExec.dir\Debug\BuildLog.htm"
+
+1>cmTryCompileExec - 1 error(s), 0 warning(s)
+
+========== Build: 0 succeeded, 1 failed, 0 up-to-date, 0 skipped ==========
+
+
+
+Determining if the function bcopy exists failed with the following output:
+Change Dir: D:/Work/WinMerge/WinMerge_SVN/Externals/pcre/Win64/CMakeFiles/CMakeTmp
+
+Run Build Command:C:\PROGRA~1\MICROS~4\Common7\IDE\devenv.com CMAKE_TRY_COMPILE.sln /build Debug /project cmTryCompileExec
+
+
+Microsoft (R) Visual Studio Version 8.0.50727.867.
+
+Copyright (C) Microsoft Corp 1984-2005. All rights reserved.
+
+1>------ Build started: Project: cmTryCompileExec, Configuration: Debug x64 ------
+
+1>Compiling...
+
+1>Microsoft (R) C/C++ Optimizing Compiler Version 14.00.50727.762 for x64
+
+1>Copyright (C) Microsoft Corporation. All rights reserved.
+
+1>cl /Od /D "WIN32" /D "_WINDOWS" /D "CHECK_FUNCTION_EXISTS=bcopy" /D "_DEBUG" /D "CMAKE_INTDIR=\"Debug\"" /D "_MBCS" /FD /RTC1 /MDd /Fo"cmTryCompileExec.dir\Debug\\" /Fd"D:/Work/WinMerge/WinMerge_SVN/Externals/pcre/Win64/CMakeFiles/CMakeTmp/Debug/cmTryCompileExec.pdb" /W3 /c /Zi /TC /Zm1000
+
+1> "c:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckFunctionExists.c"
+
+1>CheckFunctionExists.c
+
+1>Compiling manifest to resources...
+
+1>Linking...
+
+1>CheckFunctionExists.obj : error LNK2019: unresolved external symbol bcopy referenced in function main
+
+1>D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeTmp\Debug\cmTryCompileExec.exe : fatal error LNK1120: 1 unresolved externals
+
+1>Build log was saved at "file://d:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeTmp\cmTryCompileExec.dir\Debug\BuildLog.htm"
+
+1>cmTryCompileExec - 2 error(s), 0 warning(s)
+
+========== Build: 0 succeeded, 1 failed, 0 up-to-date, 0 skipped ==========
+
+
+
+Determining if the function strtoll exists failed with the following output:
+Change Dir: D:/Work/WinMerge/WinMerge_SVN/Externals/pcre/Win64/CMakeFiles/CMakeTmp
+
+Run Build Command:C:\PROGRA~1\MICROS~4\Common7\IDE\devenv.com CMAKE_TRY_COMPILE.sln /build Debug /project cmTryCompileExec
+
+
+Microsoft (R) Visual Studio Version 8.0.50727.867.
+
+Copyright (C) Microsoft Corp 1984-2005. All rights reserved.
+
+1>------ Build started: Project: cmTryCompileExec, Configuration: Debug x64 ------
+
+1>Compiling...
+
+1>Microsoft (R) C/C++ Optimizing Compiler Version 14.00.50727.762 for x64
+
+1>Copyright (C) Microsoft Corporation. All rights reserved.
+
+1>cl /Od /D "WIN32" /D "_WINDOWS" /D "CHECK_FUNCTION_EXISTS=strtoll" /D "_DEBUG" /D "CMAKE_INTDIR=\"Debug\"" /D "_MBCS" /FD /RTC1 /MDd /Fo"cmTryCompileExec.dir\Debug\\" /Fd"D:/Work/WinMerge/WinMerge_SVN/Externals/pcre/Win64/CMakeFiles/CMakeTmp/Debug/cmTryCompileExec.pdb" /W3 /c /Zi /TC /Zm1000
+
+1> "c:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckFunctionExists.c"
+
+1>CheckFunctionExists.c
+
+1>Compiling manifest to resources...
+
+1>Linking...
+
+1>CheckFunctionExists.obj : error LNK2019: unresolved external symbol strtoll referenced in function main
+
+1>D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeTmp\Debug\cmTryCompileExec.exe : fatal error LNK1120: 1 unresolved externals
+
+1>Build log was saved at "file://d:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeTmp\cmTryCompileExec.dir\Debug\BuildLog.htm"
+
+1>cmTryCompileExec - 2 error(s), 0 warning(s)
+
+========== Build: 0 succeeded, 1 failed, 0 up-to-date, 0 skipped ==========
+
+
+
+Determining if the function strtoq exists failed with the following output:
+Change Dir: D:/Work/WinMerge/WinMerge_SVN/Externals/pcre/Win64/CMakeFiles/CMakeTmp
+
+Run Build Command:C:\PROGRA~1\MICROS~4\Common7\IDE\devenv.com CMAKE_TRY_COMPILE.sln /build Debug /project cmTryCompileExec
+
+
+Microsoft (R) Visual Studio Version 8.0.50727.867.
+
+Copyright (C) Microsoft Corp 1984-2005. All rights reserved.
+
+1>------ Build started: Project: cmTryCompileExec, Configuration: Debug x64 ------
+
+1>Compiling...
+
+1>Microsoft (R) C/C++ Optimizing Compiler Version 14.00.50727.762 for x64
+
+1>Copyright (C) Microsoft Corporation. All rights reserved.
+
+1>cl /Od /D "WIN32" /D "_WINDOWS" /D "CHECK_FUNCTION_EXISTS=strtoq" /D "_DEBUG" /D "CMAKE_INTDIR=\"Debug\"" /D "_MBCS" /FD /RTC1 /MDd /Fo"cmTryCompileExec.dir\Debug\\" /Fd"D:/Work/WinMerge/WinMerge_SVN/Externals/pcre/Win64/CMakeFiles/CMakeTmp/Debug/cmTryCompileExec.pdb" /W3 /c /Zi /TC /Zm1000
+
+1> "c:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckFunctionExists.c"
+
+1>CheckFunctionExists.c
+
+1>Compiling manifest to resources...
+
+1>Linking...
+...
[truncated message content] |
|
From: <ki...@us...> - 2009-12-31 20:31:40
|
Revision: 7078
http://winmerge.svn.sourceforge.net/winmerge/?rev=7078&view=rev
Author: kimmov
Date: 2009-12-31 20:31:33 +0000 (Thu, 31 Dec 2009)
Log Message:
-----------
Fix PCRE project to build for 64-bit. Use path macros in project file.
Modified Paths:
--------------
trunk/Externals/pcre/Win64/pcre.vcproj
Modified: trunk/Externals/pcre/Win64/pcre.vcproj
===================================================================
--- trunk/Externals/pcre/Win64/pcre.vcproj 2009-12-31 20:10:44 UTC (rev 7077)
+++ trunk/Externals/pcre/Win64/pcre.vcproj 2009-12-31 20:31:33 UTC (rev 7078)
@@ -1,14 +1,18 @@
-<?xml version="1.0" encoding = "Windows-1252"?>
+<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="8.00"
Name="pcre"
ProjectGUID="{A316CDC1-94DD-4B87-816F-F8747568DA1D}"
- Keyword="Win32Proj">
+ Keyword="Win32Proj"
+ >
<Platforms>
<Platform
- Name="x64"/>
+ Name="x64"
+ />
</Platforms>
+ <ToolFiles>
+ </ToolFiles>
<Configurations>
<Configuration
Name="Debug|x64"
@@ -16,61 +20,99 @@
IntermediateDirectory="pcre.dir\Debug"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
<Tool
- Name="VCCLCompilerTool"
- AdditionalOptions=" /Zm1000"
- AdditionalIncludeDirectories="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre;"
- BasicRuntimeChecks="3"
- CompileAs="1"
- DebugInformationFormat="3"
- ExceptionHandling="0"
- InlineFunctionExpansion="0"
- Optimization="0"
- RuntimeLibrary="3"
- WarningLevel="3"
- PreprocessorDefinitions="WIN32,_WINDOWS,_DEBUG,HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"Debug\",pcre_EXPORTS"
- AssemblerListingLocation="Debug"
- ObjectFile="$(IntDir)\"
- ProgramDataBaseFileName="D:/Work/WinMerge/WinMerge_SVN/Externals/pcre/Win64/Debug/pcred.pdb"
-/>
+ Name="VCPreBuildEventTool"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCCustomBuildTool"
+ />
<Tool
- Name="VCResourceCompilerTool"
- AdditionalIncludeDirectories="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre;"
- PreprocessorDefinitions="WIN32,_WINDOWS,_DEBUG,HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"Debug\",pcre_EXPORTS"/>
+ Name="VCXMLDataGeneratorTool"
+ />
<Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
Name="VCMIDLTool"
PreprocessorDefinitions="WIN32,_WINDOWS,_DEBUG,HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"Debug\",pcre_EXPORTS"
- MkTypLibCompatible="FALSE"
+ MkTypLibCompatible="false"
TargetEnvironment="3"
- GenerateStublessProxies="TRUE"
+ GenerateStublessProxies="true"
TypeLibraryName="$(InputName).tlb"
OutputDirectory="$(IntDir)"
HeaderFileName="$(InputName).h"
DLLDataFileName=""
InterfaceIdentifierFileName="$(InputName)_i.c"
- ProxyFileName="$(InputName)_p.c"/>
+ ProxyFileName="$(InputName)_p.c"
+ />
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCCLCompilerTool"
+ AdditionalOptions=" /Zm1000"
+ Optimization="0"
+ InlineFunctionExpansion="0"
+ AdditionalIncludeDirectories=".;.."
+ PreprocessorDefinitions="WIN64,_WINDOWS,_DEBUG,HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"Debug\",pcre_EXPORTS"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ AssemblerListingLocation="Debug"
+ ObjectFile="$(IntDir)\"
+ ProgramDataBaseFileName="$(OutDir)/pcre.pdb"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ CompileAs="1"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="WIN32,_WINDOWS,_DEBUG,HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"Debug\",pcre_EXPORTS"
+ AdditionalIncludeDirectories="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre;"
+ />
<Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
Name="VCLinkerTool"
LinkLibraryDependencies="false"
AdditionalOptions=" /STACK:10000000 /machine:x64 /debug"
AdditionalDependencies="$(NOINHERIT) kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib "
- OutputFile="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\Debug\pcred.dll"
+ OutputFile="$(OutDir)\pcre.dll"
Version="0.0"
LinkIncremental="2"
AdditionalLibraryDirectories=""
- ProgramDataBaseFile="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\Debug\pcred.pdb"
- GenerateDebugInformation="TRUE"
- ImportLibrary="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\Debug\pcred.lib"/>
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)\pcre.pdb"
+ ImportLibrary="$(OutDir)\pcre.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
<Configuration
Name="Release|x64"
@@ -78,48 +120,61 @@
IntermediateDirectory="pcre.dir\Release"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
<Tool
- Name="VCCLCompilerTool"
- AdditionalOptions=" /Zm1000"
- AdditionalIncludeDirectories="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre;"
- CompileAs="1"
- ExceptionHandling="0"
- InlineFunctionExpansion="2"
- Optimization="2"
- RuntimeLibrary="2"
- WarningLevel="3"
- PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"Release\",pcre_EXPORTS"
- AssemblerListingLocation="Release"
- ObjectFile="$(IntDir)\"
- ProgramDataBaseFileName="D:/Work/WinMerge/WinMerge_SVN/Externals/pcre/Win64/Release/pcre.pdb"
-/>
+ Name="VCPreBuildEventTool"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCCustomBuildTool"
+ />
<Tool
- Name="VCResourceCompilerTool"
- AdditionalIncludeDirectories="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre;"
- PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"Release\",pcre_EXPORTS"/>
+ Name="VCXMLDataGeneratorTool"
+ />
<Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
Name="VCMIDLTool"
PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"Release\",pcre_EXPORTS"
- MkTypLibCompatible="FALSE"
+ MkTypLibCompatible="false"
TargetEnvironment="3"
- GenerateStublessProxies="TRUE"
+ GenerateStublessProxies="true"
TypeLibraryName="$(InputName).tlb"
OutputDirectory="$(IntDir)"
HeaderFileName="$(InputName).h"
DLLDataFileName=""
InterfaceIdentifierFileName="$(InputName)_i.c"
- ProxyFileName="$(InputName)_p.c"/>
+ ProxyFileName="$(InputName)_p.c"
+ />
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCCLCompilerTool"
+ AdditionalOptions=" /Zm1000"
+ Optimization="2"
+ InlineFunctionExpansion="2"
+ AdditionalIncludeDirectories="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre;"
+ PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"Release\",pcre_EXPORTS"
+ ExceptionHandling="0"
+ RuntimeLibrary="2"
+ AssemblerListingLocation="Release"
+ ObjectFile="$(IntDir)\"
+ ProgramDataBaseFileName="D:/Work/WinMerge/WinMerge_SVN/Externals/pcre/Win64/Release/pcre.pdb"
+ WarningLevel="3"
+ CompileAs="1"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"Release\",pcre_EXPORTS"
+ AdditionalIncludeDirectories="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre;"
+ />
<Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
Name="VCLinkerTool"
LinkLibraryDependencies="false"
AdditionalOptions=" /STACK:10000000 /machine:x64"
@@ -128,8 +183,33 @@
Version="0.0"
LinkIncremental="1"
AdditionalLibraryDirectories=""
- ProgramDataBaseFile="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\Release\pcre.pdb"
- ImportLibrary="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\Release\pcre.lib"/>
+ ProgramDatabaseFile="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\Release\pcre.pdb"
+ ImportLibrary="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\Release\pcre.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
<Configuration
Name="MinSizeRel|x64"
@@ -137,58 +217,96 @@
IntermediateDirectory="pcre.dir\MinSizeRel"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
<Tool
- Name="VCCLCompilerTool"
- AdditionalOptions=" /Zm1000"
- AdditionalIncludeDirectories="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre;"
- CompileAs="1"
- ExceptionHandling="0"
- InlineFunctionExpansion="1"
- Optimization="1"
- RuntimeLibrary="2"
- WarningLevel="3"
- PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"MinSizeRel\",pcre_EXPORTS"
- AssemblerListingLocation="MinSizeRel"
- ObjectFile="$(IntDir)\"
- ProgramDataBaseFileName="D:/Work/WinMerge/WinMerge_SVN/Externals/pcre/Win64/MinSizeRel/pcre.pdb"
-/>
+ Name="VCPreBuildEventTool"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCCustomBuildTool"
+ />
<Tool
- Name="VCResourceCompilerTool"
- AdditionalIncludeDirectories="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre;"
- PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"MinSizeRel\",pcre_EXPORTS"/>
+ Name="VCXMLDataGeneratorTool"
+ />
<Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
Name="VCMIDLTool"
PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"MinSizeRel\",pcre_EXPORTS"
- MkTypLibCompatible="FALSE"
+ MkTypLibCompatible="false"
TargetEnvironment="3"
- GenerateStublessProxies="TRUE"
+ GenerateStublessProxies="true"
TypeLibraryName="$(InputName).tlb"
OutputDirectory="$(IntDir)"
HeaderFileName="$(InputName).h"
DLLDataFileName=""
InterfaceIdentifierFileName="$(InputName)_i.c"
- ProxyFileName="$(InputName)_p.c"/>
+ ProxyFileName="$(InputName)_p.c"
+ />
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCCLCompilerTool"
+ AdditionalOptions=" /Zm1000"
+ Optimization="1"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories=".;.."
+ PreprocessorDefinitions="WIN64,_WINDOWS,NDEBUG,HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"MinSizeRel\",pcre_EXPORTS"
+ ExceptionHandling="0"
+ RuntimeLibrary="2"
+ AssemblerListingLocation="MinSizeRel"
+ ObjectFile="$(IntDir)\"
+ ProgramDataBaseFileName="$(outDir)/pcre.pdb"
+ WarningLevel="3"
+ CompileAs="1"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"MinSizeRel\",pcre_EXPORTS"
+ AdditionalIncludeDirectories="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre;"
+ />
<Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
Name="VCLinkerTool"
LinkLibraryDependencies="false"
AdditionalOptions=" /STACK:10000000 /machine:x64"
- AdditionalDependencies="$(NOINHERIT) kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib "
- OutputFile="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\MinSizeRel\pcre.dll"
+ AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib $(NOINHERIT)"
+ OutputFile="$(OutDir)\pcre.dll"
Version="0.0"
LinkIncremental="1"
AdditionalLibraryDirectories=""
- ProgramDataBaseFile="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\MinSizeRel\pcre.pdb"
- ImportLibrary="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\MinSizeRel\pcre.lib"/>
+ ProgramDatabaseFile="$(OutDir)\pcre.pdb"
+ ImportLibrary="$(OutDir)\pcre.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
<Configuration
Name="RelWithDebInfo|x64"
@@ -196,49 +314,62 @@
IntermediateDirectory="pcre.dir\RelWithDebInfo"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
<Tool
- Name="VCCLCompilerTool"
- AdditionalOptions=" /Zm1000"
- AdditionalIncludeDirectories="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre;"
- CompileAs="1"
- DebugInformationFormat="3"
- ExceptionHandling="0"
- InlineFunctionExpansion="1"
- Optimization="2"
- RuntimeLibrary="2"
- WarningLevel="3"
- PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"RelWithDebInfo\",pcre_EXPORTS"
- AssemblerListingLocation="RelWithDebInfo"
- ObjectFile="$(IntDir)\"
- ProgramDataBaseFileName="D:/Work/WinMerge/WinMerge_SVN/Externals/pcre/Win64/RelWithDebInfo/pcre.pdb"
-/>
+ Name="VCPreBuildEventTool"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCCustomBuildTool"
+ />
<Tool
- Name="VCResourceCompilerTool"
- AdditionalIncludeDirectories="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre;"
- PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"RelWithDebInfo\",pcre_EXPORTS"/>
+ Name="VCXMLDataGeneratorTool"
+ />
<Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
Name="VCMIDLTool"
PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"RelWithDebInfo\",pcre_EXPORTS"
- MkTypLibCompatible="FALSE"
+ MkTypLibCompatible="false"
TargetEnvironment="3"
- GenerateStublessProxies="TRUE"
+ GenerateStublessProxies="true"
TypeLibraryName="$(InputName).tlb"
OutputDirectory="$(IntDir)"
HeaderFileName="$(InputName).h"
DLLDataFileName=""
InterfaceIdentifierFileName="$(InputName)_i.c"
- ProxyFileName="$(InputName)_p.c"/>
+ ProxyFileName="$(InputName)_p.c"
+ />
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCCLCompilerTool"
+ AdditionalOptions=" /Zm1000"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre;"
+ PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"RelWithDebInfo\",pcre_EXPORTS"
+ ExceptionHandling="0"
+ RuntimeLibrary="2"
+ AssemblerListingLocation="RelWithDebInfo"
+ ObjectFile="$(IntDir)\"
+ ProgramDataBaseFileName="D:/Work/WinMerge/WinMerge_SVN/Externals/pcre/Win64/RelWithDebInfo/pcre.pdb"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ CompileAs="1"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"RelWithDebInfo\",pcre_EXPORTS"
+ AdditionalIncludeDirectories="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre;"
+ />
<Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
Name="VCLinkerTool"
LinkLibraryDependencies="false"
AdditionalOptions=" /STACK:10000000 /machine:x64 /debug"
@@ -247,125 +378,183 @@
Version="0.0"
LinkIncremental="2"
AdditionalLibraryDirectories=""
- ProgramDataBaseFile="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\RelWithDebInfo\pcre.pdb"
- GenerateDebugInformation="TRUE"
- ImportLibrary="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\RelWithDebInfo\pcre.lib"/>
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\RelWithDebInfo\pcre.pdb"
+ ImportLibrary="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\RelWithDebInfo\pcre.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
</Configurations>
+ <References>
+ </References>
<Files>
- <File
- RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\CMakeLists.txt">
- <FileConfiguration
- Name="Debug|x64">
- <Tool
- Name="VCCustomBuildTool"
- Description="Building Custom Rule D:/Work/WinMerge/WinMerge_SVN/Externals/pcre/CMakeLists.txt"
- CommandLine=""C:\Program Files\CMake 2.8\bin\cmake.exe" -HD:/Work/WinMerge/WinMerge_SVN/Externals/pcre -BD:/Work/WinMerge/WinMerge_SVN/Externals/pcre/Win64 --check-stamp-file CMakeFiles/generate.stamp"
- AdditionalDependencies="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\CMakeLists.txt;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeSystem.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeCCompiler.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeCXXCompiler.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeSystemSpecificInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeGenericSystem.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\gcc.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\Windows.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\WindowsPaths.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\Windows-cl.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeCPlatform.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeCXXPlatform.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\cl.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeRCCompiler.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeRCInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCommonLanguageInclude.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCXXInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCommonLanguageInclude.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\FindBZip2.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\cmake\FindPackageHandleStandardArgs.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\FindZLIB.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\cmake\FindPackageHandleStandardArgs.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\cmake\FindReadline.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\cmake\FindPackageHandleStandardArgs.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckIncludeFile.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckIncludeFileCXX.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckFunctionExists.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckTypeSize.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckIncludeFile.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\config-cmake.h.in;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre.h.generic;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_stringpiece.h.in;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcrecpparg.h.in;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_chartables.c.dist;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\CMakeLists.txt;"
- Outputs="CMakeFiles\generate.stamp"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|x64">
- <Tool
- Name="VCCustomBuildTool"
- Description="Building Custom Rule D:/Work/WinMerge/WinMerge_SVN/Externals/pcre/CMakeLists.txt"
- CommandLine=""C:\Program Files\CMake 2.8\bin\cmake.exe" -HD:/Work/WinMerge/WinMerge_SVN/Externals/pcre -BD:/Work/WinMerge/WinMerge_SVN/Externals/pcre/Win64 --check-stamp-file CMakeFiles/generate.stamp"
- AdditionalDependencies="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\CMakeLists.txt;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeSystem.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeCCompiler.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeCXXCompiler.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeSystemSpecificInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeGenericSystem.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\gcc.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\Windows.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\WindowsPaths.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\Windows-cl.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeCPlatform.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeCXXPlatform.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\cl.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeRCCompiler.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeRCInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCommonLanguageInclude.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCXXInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCommonLanguageInclude.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\FindBZip2.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\cmake\FindPackageHandleStandardArgs.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\FindZLIB.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\cmake\FindPackageHandleStandardArgs.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\cmake\FindReadline.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\cmake\FindPackageHandleStandardArgs.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckIncludeFile.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckIncludeFileCXX.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckFunctionExists.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckTypeSize.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckIncludeFile.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\config-cmake.h.in;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre.h.generic;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_stringpiece.h.in;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcrecpparg.h.in;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_chartables.c.dist;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\CMakeLists.txt;"
- Outputs="CMakeFiles\generate.stamp"/>
- </FileConfiguration>
- <FileConfiguration
- Name="MinSizeRel|x64">
- <Tool
- Name="VCCustomBuildTool"
- Description="Building Custom Rule D:/Work/WinMerge/WinMerge_SVN/Externals/pcre/CMakeLists.txt"
- CommandLine=""C:\Program Files\CMake 2.8\bin\cmake.exe" -HD:/Work/WinMerge/WinMerge_SVN/Externals/pcre -BD:/Work/WinMerge/WinMerge_SVN/Externals/pcre/Win64 --check-stamp-file CMakeFiles/generate.stamp"
- AdditionalDependencies="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\CMakeLists.txt;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeSystem.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeCCompiler.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeCXXCompiler.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeSystemSpecificInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeGenericSystem.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\gcc.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\Windows.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\WindowsPaths.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\Windows-cl.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeCPlatform.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeCXXPlatform.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\cl.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeRCCompiler.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeRCInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCommonLanguageInclude.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCXXInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCommonLanguageInclude.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\FindBZip2.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\cmake\FindPackageHandleStandardArgs.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\FindZLIB.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\cmake\FindPackageHandleStandardArgs.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\cmake\FindReadline.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\cmake\FindPackageHandleStandardArgs.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckIncludeFile.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckIncludeFileCXX.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckFunctionExists.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckTypeSize.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckIncludeFile.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\config-cmake.h.in;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre.h.generic;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_stringpiece.h.in;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcrecpparg.h.in;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_chartables.c.dist;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\CMakeLists.txt;"
- Outputs="CMakeFiles\generate.stamp"/>
- </FileConfiguration>
- <FileConfiguration
- Name="RelWithDebInfo|x64">
- <Tool
- Name="VCCustomBuildTool"
- Description="Building Custom Rule D:/Work/WinMerge/WinMerge_SVN/Externals/pcre/CMakeLists.txt"
- CommandLine=""C:\Program Files\CMake 2.8\bin\cmake.exe" -HD:/Work/WinMerge/WinMerge_SVN/Externals/pcre -BD:/Work/WinMerge/WinMerge_SVN/Externals/pcre/Win64 --check-stamp-file CMakeFiles/generate.stamp"
- AdditionalDependencies="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\CMakeLists.txt;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeSystem.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeCCompiler.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeCXXCompiler.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeSystemSpecificInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeGenericSystem.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\gcc.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\Windows.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\WindowsPaths.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\Windows-cl.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeCPlatform.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeCXXPlatform.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\cl.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeRCCompiler.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeRCInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCommonLanguageInclude.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCXXInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCommonLanguageInclude.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\FindBZip2.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\cmake\FindPackageHandleStandardArgs.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\FindZLIB.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\cmake\FindPackageHandleStandardArgs.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\cmake\FindReadline.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\cmake\FindPackageHandleStandardArgs.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckIncludeFile.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckIncludeFileCXX.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckFunctionExists.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckTypeSize.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckIncludeFile.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\config-cmake.h.in;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre.h.generic;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_stringpiece.h.in;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcrecpparg.h.in;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_chartables.c.dist;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\CMakeLists.txt;"
- Outputs="CMakeFiles\generate.stamp"/>
- </FileConfiguration>
- </File>
<Filter
Name="Source Files"
- Filter="">
+ >
<File
- RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\pcre_chartables.c">
+ RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\pcre_chartables.c"
+ >
</File>
<File
- RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_compile.c">
+ RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_compile.c"
+ >
</File>
<File
- RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_config.c">
+ RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_config.c"
+ >
</File>
<File
- RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_dfa_exec.c">
+ RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_dfa_exec.c"
+ >
</File>
<File
- RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_exec.c">
+ RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_exec.c"
+ >
</File>
<File
- RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_fullinfo.c">
+ RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_fullinfo.c"
+ >
</File>
<File
- RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_get.c">
+ RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_get.c"
+ >
</File>
<File
- RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_globals.c">
+ RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_globals.c"
+ >
</File>
<File
- RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_info.c">
+ RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_info.c"
+ >
</File>
<File
- RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_newline.c">
+ RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_maketables.c"
+ >
</File>
<File
- RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_maketables.c">
+ RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_newline.c"
+ >
</File>
<File
- RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_ord2utf8.c">
+ RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_ord2utf8.c"
+ >
</File>
<File
- RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_refcount.c">
+ RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_refcount.c"
+ >
</File>
<File
- RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_study.c">
+ RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_study.c"
+ >
</File>
<File
- RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_tables.c">
+ RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_tables.c"
+ >
</File>
<File
- RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_try_flipped.c">
+ RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_try_flipped.c"
+ >
</File>
<File
- RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_ucd.c">
+ RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_ucd.c"
+ >
</File>
<File
- RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_valid_utf8.c">
+ RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_valid_utf8.c"
+ >
</File>
<File
- RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_version.c">
+ RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_version.c"
+ >
</File>
<File
- RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_xclass.c">
+ RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_xclass.c"
+ >
</File>
</Filter>
<Filter
Name="Header Files"
- Filter="">
+ >
<File
- RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\pcre.h">
+ RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\config.h"
+ >
</File>
<File
- RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\config.h">
+ RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\pcre.h"
+ >
</File>
</Filter>
+ <File
+ RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\CMakeLists.txt"
+ >
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Building Custom Rule D:/Work/WinMerge/WinMerge_SVN/Externals/pcre/CMakeLists.txt"
+ CommandLine=""C:\Program Files\CMake 2.8\bin\cmake.exe" -HD:/Work/WinMerge/WinMerge_SVN/Externals/pcre -BD:/Work/WinMerge/WinMerge_SVN/Externals/pcre/Win64 --check-stamp-file CMakeFiles/generate.stamp
"
+ AdditionalDependencies="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\CMakeLists.txt;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeSystem.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeCCompiler.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeCXXCompiler.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeSystemSpecificInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeGenericSystem.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\gcc.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\Windows.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\WindowsPaths.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\Windows-cl.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeCPlatform.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeCXXPlatform.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\cl.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeRCCompiler.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeRCInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCommonLanguageInclude.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCXXInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCommonLanguageInclude.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\FindBZip2.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\cmake\FindPackageHandleStandardArgs.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\FindZLIB.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\cmake\FindPackageHandleStandardArgs.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\cmake\FindReadline.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\cmake\FindPackageHandleStandardArgs.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckIncludeFile.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckIncludeFileCXX.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckFunctionExists.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckTypeSize.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckIncludeFile.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\config-cmake.h.in;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre.h.generic;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_stringpiece.h.in;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcrecpparg.h.in;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_chartables.c.dist;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\CMakeLists.txt;"
+ Outputs="CMakeFiles\generate.stamp"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Building Custom Rule D:/Work/WinMerge/WinMerge_SVN/Externals/pcre/CMakeLists.txt"
+ CommandLine=""C:\Program Files\CMake 2.8\bin\cmake.exe" -HD:/Work/WinMerge/WinMerge_SVN/Externals/pcre -BD:/Work/WinMerge/WinMerge_SVN/Externals/pcre/Win64 --check-stamp-file CMakeFiles/generate.stamp
"
+ AdditionalDependencies="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\CMakeLists.txt;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeSystem.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeCCompiler.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeCXXCompiler.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeSystemSpecificInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeGenericSystem.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\gcc.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\Windows.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\WindowsPaths.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\Windows-cl.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeCPlatform.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeCXXPlatform.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\cl.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeRCCompiler.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeRCInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCommonLanguageInclude.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCXXInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCommonLanguageInclude.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\FindBZip2.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\cmake\FindPackageHandleStandardArgs.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\FindZLIB.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\cmake\FindPackageHandleStandardArgs.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\cmake\FindReadline.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\cmake\FindPackageHandleStandardArgs.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckIncludeFile.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckIncludeFileCXX.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckFunctionExists.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckTypeSize.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckIncludeFile.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\config-cmake.h.in;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre.h.generic;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_stringpiece.h.in;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcrecpparg.h.in;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_chartables.c.dist;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\CMakeLists.txt;"
+ Outputs="CMakeFiles\generate.stamp"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="MinSizeRel|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Building Custom Rule D:/Work/WinMerge/WinMerge_SVN/Externals/pcre/CMakeLists.txt"
+ CommandLine=""C:\Program Files\CMake 2.8\bin\cmake.exe" -HD:/Work/WinMerge/WinMerge_SVN/Externals/pcre -BD:/Work/WinMerge/WinMerge_SVN/Externals/pcre/Win64 --check-stamp-file CMakeFiles/generate.stamp
"
+ AdditionalDependencies="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\CMakeLists.txt;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeSystem.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeCCompiler.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeCXXCompiler.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeSystemSpecificInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeGenericSystem.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\gcc.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\Windows.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\WindowsPaths.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\Windows-cl.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeCPlatform.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeCXXPlatform.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\cl.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeRCCompiler.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeRCInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCommonLanguageInclude.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCXXInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCommonLanguageInclude.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\FindBZip2.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\cmake\FindPackageHandleStandardArgs.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\FindZLIB.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\cmake\FindPackageHandleStandardArgs.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\cmake\FindReadline.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\cmake\FindPackageHandleStandardArgs.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckIncludeFile.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckIncludeFileCXX.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckFunctionExists.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckTypeSize.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckIncludeFile.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\config-cmake.h.in;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre.h.generic;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_stringpiece.h.in;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcrecpparg.h.in;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_chartables.c.dist;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\CMakeLists.txt;"
+ Outputs="CMakeFiles\generate.stamp"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="RelWithDebInfo|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Building Custom Rule D:/Work/WinMerge/WinMerge_SVN/Externals/pcre/CMakeLists.txt"
+ CommandLine=""C:\Program Files\CMake 2.8\bin\cmake.exe" -HD:/Work/WinMerge/WinMerge_SVN/Externals/pcre -BD:/Work/WinMerge/WinMerge_SVN/Externals/pcre/Win64 --check-stamp-file CMakeFiles/generate.stamp
"
+ AdditionalDependencies="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\CMakeLists.txt;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeSystem.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeCCompiler.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeCXXCompiler.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeSystemSpecificInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeGenericSystem.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\gcc.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\Windows.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\WindowsPaths.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\Windows-cl.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeCPlatform.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeCXXPlatform.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\cl.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win64\CMakeFiles\CMakeRCCompiler.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeRCInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCommonLanguageInclude.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCXXInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCommonLanguageInclude.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\FindBZip2.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\cmake\FindPackageHandleStandardArgs.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\FindZLIB.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\cmake\FindPackageHandleStandardArgs.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\cmake\FindReadline.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\cmake\FindPackageHandleStandardArgs.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckIncludeFile.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckIncludeFileCXX.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckFunctionExists.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckTypeSize.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckIncludeFile.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\config-cmake.h.in;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre.h.generic;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_stringpiece.h.in;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcrecpparg.h.in;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_chartables.c.dist;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\CMakeLists.txt;"
+ Outputs="CMakeFiles\generate.stamp"
+ />
+ </FileConfiguration>
+ </File>
</Files>
<Globals>
</Globals>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-12-31 12:26:25
|
Revision: 7076
http://winmerge.svn.sourceforge.net/winmerge/?rev=7076&view=rev
Author: kimmov
Date: 2009-12-31 12:26:17 +0000 (Thu, 31 Dec 2009)
Log Message:
-----------
PATCH: [ 2922517 ] panes gets unaligned if differs for a EOL
Fixes bug #2794894
Submitted by Matthias Mayer
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/DiffWrapper.cpp
trunk/Src/DiffWrapper.h
trunk/Src/MergeDoc.cpp
trunk/Src/diffutils/src/IO.C
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2009-12-30 22:57:20 UTC (rev 7075)
+++ trunk/Docs/Users/ChangeLog.txt 2009-12-31 12:26:17 UTC (rev 7076)
@@ -11,6 +11,8 @@
Bugfix: Selected custom odepage was not used (#2921555)
Bugfix: Created new matching folder to wrong folder (#2890961)
Bugfix: Pane headers not updated after language change (#2923684)
+ Bugfix: File panes become unaligned when last line didn't have
+ an EOL byte (#2922517)
WinMerge 2.13.10 2009-12-21 (r7051)
Visual Studio project files upgraded to VS2005 format (r7045)
Modified: trunk/Src/DiffWrapper.cpp
===================================================================
--- trunk/Src/DiffWrapper.cpp 2009-12-30 22:57:20 UTC (rev 7075)
+++ trunk/Src/DiffWrapper.cpp 2009-12-31 12:26:17 UTC (rev 7076)
@@ -864,12 +864,16 @@
/**
* @brief Expand last DIFFRANGE of file by one line to contain last line after EOL.
+ * @param [in] leftBufferLines size of array pane left
+ * @param [in] rightBufferLines size of array pane right
+ * @param [in] left on whitch side we have to insert
+ * @param [in] bIgnoreBlankLines, if true we allways add a new diff and make as trivial
*/
-void CDiffWrapper::FixLastDiffRange(int leftBufferLines, int rightBufferLines, BOOL left)
+void CDiffWrapper::FixLastDiffRange(int leftBufferLines, int rightBufferLines, BOOL left, bool bIgnoreBlankLines)
{
DIFFRANGE dr;
const int count = m_pDiffList->GetSize();
- if (count > 0)
+ if (count > 0 && !bIgnoreBlankLines)
{
m_pDiffList->GetDiff(count - 1, dr);
@@ -904,6 +908,8 @@
dr.begin1 = dr.end1;
dr.op = OP_RIGHTONLY;
}
+ if (bIgnoreBlankLines)
+ dr.op = OP_TRIVIAL;
ASSERT(dr.begin0 == dr.begin1);
AddDiffRange(dr.begin0, dr.end0, dr.begin1, dr.end1, dr.op);
Modified: trunk/Src/DiffWrapper.h
===================================================================
--- trunk/Src/DiffWrapper.h 2009-12-30 22:57:20 UTC (rev 7075)
+++ trunk/Src/DiffWrapper.h 2009-12-31 12:26:17 UTC (rev 7076)
@@ -164,7 +164,7 @@
BOOL RunFileDiff();
void GetDiffStatus(DIFFSTATUS *status);
void AddDiffRange(UINT begin0, UINT end0, UINT begin1, UINT end1, BYTE op);
- void FixLastDiffRange(int leftBufferLines, int rightBufferLines, BOOL left);
+ void FixLastDiffRange(int leftBufferLines, int rightBufferLines, BOOL left, bool bIgnoreBlankLines);
MovedLines * GetMovedLines() { return m_pMovedLines; }
void SetCompareFiles(const String &OriginalFile1, const String &OriginalFile2);
void SetFilterList(LPCTSTR filterStr);
Modified: trunk/Src/MergeDoc.cpp
===================================================================
--- trunk/Src/MergeDoc.cpp 2009-12-30 22:57:20 UTC (rev 7075)
+++ trunk/Src/MergeDoc.cpp 2009-12-31 12:26:17 UTC (rev 7076)
@@ -514,17 +514,6 @@
if (bBinary) // believe caller if we were told these are binaries
status.bBinaries = TRUE;
- // If comparing whitespaces and
- // other file has EOL before EOF and other not...
- if (status.bLeftMissingNL != status.bRightMissingNL &&
- !diffOptions.nIgnoreWhitespace && !diffOptions.bIgnoreBlankLines)
- {
- // ..lasf DIFFRANGE of file which has EOL must be
- // fixed to contain last line too
- m_diffWrapper.FixLastDiffRange(m_ptBuf[0]->GetLineCount(), m_ptBuf[1]->GetLineCount(),
- status.bRightMissingNL);
- }
-
// set identical/diff result as recorded by diffutils
bIdentical = status.bIdentical;
@@ -553,6 +542,15 @@
m_ptBuf[0]->prepareForRescan();
m_ptBuf[1]->prepareForRescan();
+ // If one file has EOL before EOF and other not...
+ if (status.bLeftMissingNL != status.bRightMissingNL)
+ {
+ // ..lasf DIFFRANGE of file which has EOL must be
+ // fixed to contain last line too
+ m_diffWrapper.FixLastDiffRange(m_ptBuf[0]->GetLineCount(), m_ptBuf[1]->GetLineCount(),
+ status.bRightMissingNL, diffOptions.bIgnoreBlankLines);
+ }
+
// Divide diff blocks to match lines.
if (GetOptionsMgr()->GetBool(OPT_CMP_MATCH_SIMILAR_LINES))
AdjustDiffBlocks();
Modified: trunk/Src/diffutils/src/IO.C
===================================================================
--- trunk/Src/diffutils/src/IO.C 2009-12-30 22:57:20 UTC (rev 7075)
+++ trunk/Src/diffutils/src/IO.C 2009-12-31 12:26:17 UTC (rev 7076)
@@ -521,7 +521,7 @@
{
p[buffered_chars++] = '\n';
current->buffered_chars = buffered_chars;
- current->missing_newline = p[buffered_chars-2] != '\r' && ! ignore_blank_lines_flag;
+ current->missing_newline = 1;
}
/* Don't use uninitialized storage when planting or using sentinels. */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-12-30 22:57:26
|
Revision: 7075
http://winmerge.svn.sourceforge.net/winmerge/?rev=7075&view=rev
Author: kimmov
Date: 2009-12-30 22:57:20 +0000 (Wed, 30 Dec 2009)
Log Message:
-----------
PATCH: [ 2923684 ] GUI Language update
Fixes bug #2808178
Submitted by Matthias Mayer
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/ChildFrm.cpp
trunk/Src/DiffViewBar.cpp
trunk/Src/DiffViewBar.h
trunk/Src/LocationBar.cpp
trunk/Src/LocationBar.h
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2009-12-29 22:48:57 UTC (rev 7074)
+++ trunk/Docs/Users/ChangeLog.txt 2009-12-30 22:57:20 UTC (rev 7075)
@@ -10,6 +10,7 @@
Bugfix: GUI Word Wrap missing text (#2921400, #2894033)
Bugfix: Selected custom odepage was not used (#2921555)
Bugfix: Created new matching folder to wrong folder (#2890961)
+ Bugfix: Pane headers not updated after language change (#2923684)
WinMerge 2.13.10 2009-12-21 (r7051)
Visual Studio project files upgraded to VS2005 format (r7045)
Modified: trunk/Src/ChildFrm.cpp
===================================================================
--- trunk/Src/ChildFrm.cpp 2009-12-29 22:48:57 UTC (rev 7074)
+++ trunk/Src/ChildFrm.cpp 2009-12-30 22:57:20 UTC (rev 7075)
@@ -767,6 +767,8 @@
{
m_leftStatus.UpdateResources();
m_rightStatus.UpdateResources();
+ m_wndLocationBar.UpdateResources();
+ m_wndDetailBar.UpdateResources();
}
/**
Modified: trunk/Src/DiffViewBar.cpp
===================================================================
--- trunk/Src/DiffViewBar.cpp 2009-12-29 22:48:57 UTC (rev 7074)
+++ trunk/Src/DiffViewBar.cpp 2009-12-30 22:57:20 UTC (rev 7075)
@@ -11,6 +11,7 @@
//////////////////////////////////////////////////////////////////////
#include "stdafx.h"
+#include "Merge.h"
#include "ChildFrm.h"
#include "DiffViewBar.h"
@@ -159,3 +160,11 @@
{
m_hwndFrame = hwndFrame;
}
+/**
+ * @brief Update any resources necessary after a GUI language change
+ */
+void CDiffViewBar::UpdateResources()
+{
+ String sCaption = theApp.LoadString(IDS_DIFFBAR_CAPTION);
+ SetWindowText(sCaption.c_str());
+}
Modified: trunk/Src/DiffViewBar.h
===================================================================
--- trunk/Src/DiffViewBar.h 2009-12-29 22:48:57 UTC (rev 7074)
+++ trunk/Src/DiffViewBar.h 2009-12-30 22:57:20 UTC (rev 7075)
@@ -38,6 +38,7 @@
int GetPanelHeight();
void UpdateBarHeight(int DiffPanelHeight);
void SetFrameHwnd(HWND hwndFrame);
+ void UpdateResources();
protected:
CSplitterWndEx * m_pwndDetailSplitter;
Modified: trunk/Src/LocationBar.cpp
===================================================================
--- trunk/Src/LocationBar.cpp 2009-12-29 22:48:57 UTC (rev 7074)
+++ trunk/Src/LocationBar.cpp 2009-12-30 22:57:20 UTC (rev 7075)
@@ -125,3 +125,11 @@
{
m_hwndFrame = hwndFrame;
}
+/**
+ * @brief Update any resources necessary after a GUI language change
+ */
+void CLocationBar::UpdateResources()
+{
+ String sCaption = theApp.LoadString(IDS_LOCBAR_CAPTION);
+ SetWindowText(sCaption.c_str());
+}
Modified: trunk/Src/LocationBar.h
===================================================================
--- trunk/Src/LocationBar.h 2009-12-29 22:48:57 UTC (rev 7074)
+++ trunk/Src/LocationBar.h 2009-12-30 22:57:20 UTC (rev 7075)
@@ -34,7 +34,7 @@
UINT nID = AFX_IDW_PANE_FIRST);
void SetFrameHwnd(HWND hwndFrame);
-
+ void UpdateResources();
protected:
// Overrides
// ClassWizard generated virtual function overrides
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-12-29 22:49:05
|
Revision: 7074
http://winmerge.svn.sourceforge.net/winmerge/?rev=7074&view=rev
Author: kimmov
Date: 2009-12-29 22:48:57 +0000 (Tue, 29 Dec 2009)
Log Message:
-----------
ShellExtension: Add 64-bit targets to project file.
Modified Paths:
--------------
trunk/ShellExtension/ShellExtension.vcproj
Modified: trunk/ShellExtension/ShellExtension.vcproj
===================================================================
--- trunk/ShellExtension/ShellExtension.vcproj 2009-12-29 19:52:31 UTC (rev 7073)
+++ trunk/ShellExtension/ShellExtension.vcproj 2009-12-29 22:48:57 UTC (rev 7074)
@@ -10,6 +10,9 @@
<Platform
Name="Win32"
/>
+ <Platform
+ Name="x64"
+ />
</Platforms>
<ToolFiles>
</ToolFiles>
@@ -578,6 +581,954 @@
Name="VCPostBuildEventTool"
/>
</Configuration>
+ <Configuration
+ Name="X64 Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Performing registration"
+ CommandLine="if "%OS%"=="" goto NOTNT
if not "%OS%"=="Windows_NT" goto NOTNT
regsvr32 /s /c "$(TargetPath)"
echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg"
goto end
:NOTNT
echo Warning : Cannot register Unicode DLL on Windows 95
:end
"
+ Outputs="$(OutDir)\regsvr32.trg"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\..\BuildTmp\ShellExtension__UnicodeDebug/ShellExtension.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=".,../src/common"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_ATL_NO_UUIDOF"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__UnicodeDebug/ShellExtension.pch"
+ AssemblerListingLocation=".\..\BuildTmp\ShellExtension__UnicodeDebug/"
+ ObjectFile=".\..\BuildTmp\ShellExtension__UnicodeDebug/"
+ ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__UnicodeDebug/"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="4"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile="..\Build\MergeUnicodeDebug\ShellExtensionU.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ ModuleDefinitionFile=".\ShellExtensionU.def"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__UnicodeDebug/ShellExtensionU.pdb"
+ SubSystem="2"
+ ImportLibrary=".\..\BuildTmp\ShellExtension__UnicodeDebug/ShellExtensionU.lib"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Unicode Debug|x64"
+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Performing registration"
+ CommandLine="if "%OS%"=="" goto NOTNT
if not "%OS%"=="Windows_NT" goto NOTNT
regsvr32 /s /c "$(TargetPath)"
echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg"
goto end
:NOTNT
echo Warning : Cannot register Unicode DLL on Windows 95
:end
"
+ Outputs="$(OutDir)\regsvr32.trg"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName=".\..\BuildTmp\ShellExtension__UnicodeDebug/ShellExtension.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=".,../src/common"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_ATL_NO_UUIDOF"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__UnicodeDebug/ShellExtension.pch"
+ AssemblerListingLocation=".\..\BuildTmp\ShellExtension__UnicodeDebug/"
+ ObjectFile=".\..\BuildTmp\ShellExtension__UnicodeDebug/"
+ ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__UnicodeDebug/"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile="..\Build\MergeUnicodeDebug\ShellExtensionU.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ ModuleDefinitionFile=".\ShellExtensionU.def"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__UnicodeDebug/ShellExtensionU.pdb"
+ SubSystem="2"
+ ImportLibrary=".\..\BuildTmp\ShellExtension__UnicodeDebug/ShellExtensionU.lib"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Unicode Release MinSize|x64"
+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ UseOfATL="2"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/ShellExtension.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories=".,../src/common"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_ATL_NO_UUIDOF"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/ShellExtension.pch"
+ AssemblerListingLocation=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/"
+ ObjectFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/"
+ ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile="..\Build\MergeUnicodeRelease\ShellExtensionU.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ ModuleDefinitionFile=".\ShellExtensionU.def"
+ ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/ShellExtensionU.pdb"
+ SubSystem="2"
+ ImportLibrary=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/ShellExtensionU.lib"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Unicode Release MinDependency|x64"
+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ UseOfATL="1"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/ShellExtension.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories=".,../src/common"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_ATL_NO_UUIDOF"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/ShellExtension.pch"
+ AssemblerListingLocation=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/"
+ ObjectFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/"
+ ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile="..\Build\MergeUnicodeRelease\ShellExtensionU.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ ModuleDefinitionFile=".\ShellExtensionU.def"
+ ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/ShellExtensionU.pdb"
+ SubSystem="2"
+ ImportLibrary=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/ShellExtensionU.lib"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release MinDependency|x64"
+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ UseOfATL="1"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/ShellExtension.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/D "NDEBUG""
+ Optimization="1"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories=".,../src/common"
+ PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;_ATL_NO_UUIDOF"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/ShellExtension.pch"
+ AssemblerListingLocation=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/"
+ ObjectFile=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/"
+ ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile="..\Build\MergeRelease\ShellExtension.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ ModuleDefinitionFile=".\ShellExtension.def"
+ ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/ShellExtension.pdb"
+ SubSystem="2"
+ ImportLibrary=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/ShellExtension.lib"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release MinSize|x64"
+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ UseOfATL="2"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName=".\..\BuildTmp\ShellExtension__ReleaseMinSize/ShellExtension.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/D "NDEBUG""
+ Optimization="1"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories=".,../src/common"
+ PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;_ATL_NO_UUIDOF"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__ReleaseMinSize/ShellExtension.pch"
+ AssemblerListingLocation=".\..\BuildTmp\ShellExtension__ReleaseMinSize/"
+ ObjectFile=".\..\BuildTmp\ShellExtension__ReleaseMinSize/"
+ ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__ReleaseMinSize/"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile="..\Build\MergeRelease\ShellExtension.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ ModuleDefinitionFile=".\ShellExtension.def"
+ ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__ReleaseMinSize/ShellExtension.pdb"
+ SubSystem="2"
+ ImportLibrary=".\..\BuildTmp\ShellExtension__ReleaseMinSize/ShellExtension.lib"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Performing registration"
+ CommandLine="regsvr32 /s /c "$(TargetPath)"
echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg"
"
+ Outputs="$(OutDir)\regsvr32.trg"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName=".\..\BuildTmp\ShellExtension__Debug/ShellExtension.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=".,../src/common"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_ATL_NO_UUIDOF"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__Debug/ShellExtension.pch"
+ AssemblerListingLocation=".\..\BuildTmp\ShellExtension__Debug/"
+ ObjectFile=".\..\BuildTmp\ShellExtension__Debug/"
+ ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__Debug/"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile="..\Build\MergeDebug\ShellExtension.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ ModuleDefinitionFile=".\ShellExtension.def"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__Debug/ShellExtension.pdb"
+ SubSystem="2"
+ ImportLibrary=".\..\BuildTmp\ShellExtension__Debug/ShellExtension.lib"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="X64 Debug|x64"
+ OutputDirectory="..\Build\$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="..\BuildTmp\$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Performing registration"
+ CommandLine="if "%OS%"=="" goto NOTNT
if not "%OS%"=="Windows_NT" goto NOTNT
regsvr32 /s /c "$(TargetPath)"
echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg"
goto end
:NOTNT
echo Warning : Cannot register Unicode DLL on Windows 95
:end
"
+ Outputs="$(OutDir)\regsvr32.trg"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(IntDir)/ShellExtension.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=".,../src/common"
+ PreprocessorDefinitions="WIN64;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_ATL_NO_UUIDOF"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(IntDir)\ShellExtension.pch"
+ AssemblerListingLocation="$(IntDir)\"
+ ObjectFile="$(IntDir)\"
+ ProgramDataBaseFileName="$(IntDir)\ShellExtensionX64.pdb"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile="$(OutDir)\ShellExtensionX64.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ ModuleDefinitionFile=".\ShellExtensionX64.def"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(IntDir)\ShellExtensionX64.pdb"
+ SubSystem="2"
+ ImportLibrary="$(OutDir)\ShellExtensionX64.lib"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="X64 Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ UseOfATL="1"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/ShellExtension.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories=".,../src/common"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_ATL_NO_UUIDOF"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/ShellExtension.pch"
+ AssemblerListingLocation=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/"
+ ObjectFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/"
+ ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile="..\Build\MergeUnicodeRelease\ShellExtensionU.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ ModuleDefinitionFile=".\ShellExtensionU.def"
+ ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/ShellExtensionU.pdb"
+ SubSystem="2"
+ ImportLibrary=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/ShellExtensionU.lib"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="X64 Release|x64"
+ OutputDirectory="..\Build\$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="..\BuildTmp\$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ UseOfATL="1"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName="$(IntDir)\ShellExtension.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories=".,../src/common"
+ PreprocessorDefinitions="WIN64;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_ATL_NO_UUIDOF"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(IntDir)\ShellExtension.pch"
+ AssemblerListingLocation="$(IntDir)\"
+ ObjectFile="$(IntDir)\"
+ ProgramDataBaseFileName="$(IntDir)\ShellExtensionX64.pdb"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile="$(OutDir)\ShellExtensionX64.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ ModuleDefinitionFile=".\ShellExtensionX64.def"
+ ProgramDatabaseFile="$(IntDir)/ShellExtensionX64.pdb"
+ SubSystem="2"
+ ImportLibrary="$(OutDir)/ShellExtensionX64.lib"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
</Configurations>
<References>
</References>
@@ -651,6 +1602,110 @@
BasicRuntimeChecks="3"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="X64 Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_NO_UUIDOF;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Unicode Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_NO_UUIDOF;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Unicode Release MinSize|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Unicode Release MinDependency|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release MinDependency|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release MinSize|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_NO_UUIDOF;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_NO_UUIDOF;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="..\src\common\RegKey.cpp"
@@ -717,6 +1772,110 @@
BasicRuntimeChecks="3"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="X64 Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_NO_UUIDOF;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Unicode Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_NO_UUIDOF;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Unicode Release MinSize|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Unicode Release MinDependency|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release MinDependency|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release MinSize|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_NO_UUIDOF;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_NO_UUIDOF;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="ShellExtension.cpp"
@@ -783,6 +1942,110 @@
BasicRuntimeChecks="3"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="X64 Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_NO_UUIDOF;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Unicode Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_NO_UUIDOF;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Unicode Release MinSize|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Unicode Release MinDependency|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release MinDependency|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release MinSize|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_NO_UUIDOF;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_NO_UUIDOF;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="ShellExtension.def"
@@ -811,6 +2074,62 @@
Name="VCCustomBuildTool"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="X64 Debug|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Unicode Debug|x64"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Unicode Release MinSize|x64"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Unicode Release MinDependency|x64"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Debug|x64"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Release|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Release|x64"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="ShellExtension.idl"
@@ -881,6 +2200,116 @@
InterfaceIdentifierFileName="ShellExtension_i.c"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="X64 Debug|Win32"
+ >
+ <Tool
+ Name="VCMIDLTool"
+ GenerateStublessProxies="true"
+ TypeLibraryName=".\ShellExtension.tlb"
+ HeaderFileName="ShellExtension.h"
+ InterfaceIdentifierFileName="ShellExtension_i.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Unicode Debug|x64"
+ >
+ <Tool
+ Name="VCMIDLTool"
+ GenerateStublessProxies="true"
+ TypeLibraryName=".\ShellExtension.tlb"
+ HeaderFileName="ShellExtension.h"
+ InterfaceIdentifierFileName="ShellExtension_i.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Unicode Release MinSize|x64"
+ >
+ <Tool
+ Name="VCMIDLTool"
+ GenerateStublessProxies="true"
+ TypeLibraryName=".\ShellExtension.tlb"
+ HeaderFileName="ShellExtension.h"
+ InterfaceIdentifierFileName="ShellExtension_i.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Unicode Release MinDependency|x64"
+ >
+ <Tool
+ Name="VCMIDLTool"
+ GenerateStublessProxies="true"
+ TypeLibraryName=".\ShellExtension.tlb"
+ HeaderFileName="ShellExtension.h"
+ InterfaceIdentifierFileName="ShellExtension_i.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release MinDependency|x64"
+ >
+ <Tool
+ Name="VCMIDLTool"
+ GenerateStublessProxies="true"
+ TypeLibraryName=".\ShellExtension.tlb"
+ HeaderFileName="ShellExtension.h"
+ InterfaceIdentifierFileName="ShellExtension_i.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release MinSize|x64"
+ >
+ <Tool
+ Name="VCMIDLTool"
+ GenerateStublessProxies="true"
+ TypeLibraryName=".\ShellExtension.tlb"
+ HeaderFileName="ShellExtension.h"
+ InterfaceIdentifierFileName="ShellExtension_i.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCMIDLTool"
+ GenerateStublessProxies="true"
+ TypeLibraryName=".\ShellExtension.tlb"
+ HeaderFileName="ShellExtension.h"
+ InterfaceIdentifierFileName="ShellExtension_i.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Debug|x64"
+ >
+ <Tool
+ Name="VCMIDLTool"
+ GenerateStublessProxies="true"
+ TypeLibraryName=".\ShellExtension.tlb"
+ HeaderFileName="ShellExtension.h"
+ InterfaceIdentifierFileName="ShellExtension_i.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Release|Win32"
+ >
+ <Tool
+ Name="VCMIDLTool"
+ GenerateStublessProxies="true"
+ TypeLibraryName=".\ShellExtension.tlb"
+ HeaderFileName="ShellExtension.h"
+ InterfaceIdentifierFileName="ShellExtension_i.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Release|x64"
+ >
+ <Tool
+ Name="VCMIDLTool"
+ GenerateStublessProxies="true"
+ TypeLibraryName=".\ShellExtension.tlb"
+ HeaderFileName="ShellExtension.h"
+ InterfaceIdentifierFileName="ShellExtension_i.c"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="ShellExtensionU.def"
@@ -909,6 +2338,30 @@
Name="VCCustomBuildTool"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Release MinDependency|x64"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release MinSize|x64"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="StdAfx.cpp"
@@ -987,6 +2440,130 @@
PrecompiledHeaderThrough="stdafx.h"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="X64 Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_NO_UUIDOF;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ UsePrecompiledHeader="1"
+ PrecompiledHeaderThrough="stdafx.h"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Unicode Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_NO_UUIDOF;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ UsePrecompiledHeader="1"
+ PrecompiledHeaderThrough="stdafx.h"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Unicode Release MinSize|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
+ UsePrecompiledHeader="1"
+ PrecompiledHeaderThrough="stdafx.h"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Unicode Release MinDependency|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
+ UsePrecompiledHeader="1"
+ PrecompiledHeaderThrough="stdafx.h"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release MinDependency|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
+ UsePrecompiledHeader="1"
+ PrecompiledHeaderThrough="stdafx.h"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release MinSize|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
+ UsePrecompiledHeader="1"
+ PrecompiledHeaderThrough="stdafx.h"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_NO_UUIDOF;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ UsePrecompiledHeader="1"
+ PrecompiledHeaderThrough="stdafx.h"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_NO_UUIDOF;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ UsePrecompiledHeader="1"
+ PrecompiledHeaderThrough="stdafx.h"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
+ UsePrecompiledHeader="1"
+ PrecompiledHeaderThrough="stdafx.h"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
+ UsePrecompiledHeader="1"
+ PrecompiledHeaderThrough="stdafx.h"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="..\Src\Common\UnicodeString.cpp"
@@ -1053,6 +2630,110 @@
BasicRuntimeChecks="3"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="X64 Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_NO_UUIDOF;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Unicode Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_NO_UUIDOF;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Unicode Release MinSize|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Unicode Release MinDependency|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release MinDependency|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release MinSize|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_NO_UUIDOF;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_NO_UUIDOF;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="WinMergeShell.cpp"
@@ -1119,6 +2800,110 @@
BasicRuntimeChecks="3"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="X64 Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_NO_UUIDOF;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Unicode Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_NO_UUIDOF;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Unicode Release MinSize|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Unicode Release MinDependency|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release MinDependency|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release MinSize|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;_ATL_NO_UUIDOF;$(NoInherit)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_NO_UUIDOF;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_NO_UUIDOF;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;_ATL_STATIC_REGISTRY;_ATL_NO_UUIDOF;$(NoInherit)"
+ />
+ </FileConfiguration>
</File>
</Filter>
<Filter
@@ -1211,6 +2996,96 @@
AdditionalIncludeDirectories="$(OUTDIR)"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="X64 Debug|Win32"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;$(NoInherit)"
+ AdditionalIncludeDirectories="$(OUTDIR)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Unicode Debug|x64"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;$(NoInherit)"
+ AdditionalIncludeDirectories="$(OUTDIR)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Unicode Release MinSize|x64"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG;$(NoInherit)"
+ AdditionalIncludeDirectories="$(OUTDIR)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Unicode Release MinDependency|x64"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG;$(NoInherit)"
+ AdditionalIncludeDirectories="$(OUTDIR)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release MinDependency|x64"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ AdditionalIncludeDirectories="$(OUTDIR)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release MinSize|x64"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ AdditionalIncludeDirectories="$(OUTDIR)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ AdditionalIncludeDirectories="$(OUTDIR)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Debug|x64"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;$(NoInherit)"
+ AdditionalIncludeDirectories="$(OUTDIR)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Release|Win32"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG;$(NoInherit)"
+ AdditionalIncludeDirectories="$(OUTDIR)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Release|x64"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG;$(NoInherit)"
+ AdditionalIncludeDirectories="$(OUTDIR)"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="Languages\ShellExtensionBrazilian.rc"
@@ -1275,6 +3150,106 @@
AdditionalIncludeDirectories="Languages;$(OUTDIR)"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="X64 Debug|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;$(NoInherit)"
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Unicode Debug|x64"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;$(NoInherit)"
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Unicode Release MinSize|x64"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG;$(NoInherit)"
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Unicode Release MinDependency|x64"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG;$(NoInherit)"
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release MinDependency|x64"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release MinSize|x64"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Debug|x64"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;$(NoInherit)"
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Release|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG;$(NoInherit)"
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Release|x64"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG;$(NoInherit)"
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="Languages\ShellExtensionBulgarian.rc"
@@ -1339,6 +3314,106 @@
AdditionalIncludeDirectories="Languages;$(OUTDIR)"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="X64 Debug|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;$(NoInherit)"
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Unicode Debug|x...
[truncated message content] |
|
From: <ki...@us...> - 2009-12-29 19:52:40
|
Revision: 7073
http://winmerge.svn.sourceforge.net/winmerge/?rev=7073&view=rev
Author: kimmov
Date: 2009-12-29 19:52:31 +0000 (Tue, 29 Dec 2009)
Log Message:
-----------
Fix PreLink.bat to copy PCRE library from new build folder.
Modified Paths:
--------------
trunk/Src/PreLink.bat
Modified: trunk/Src/PreLink.bat
===================================================================
--- trunk/Src/PreLink.bat 2009-12-29 19:50:39 UTC (rev 7072)
+++ trunk/Src/PreLink.bat 2009-12-29 19:52:31 UTC (rev 7073)
@@ -90,10 +90,8 @@
cd %2\..\..\..\Externals\pcre\Win32
%msdev% "pcre.dsp" /make "pcre - Win32 Debug"
%devenv% "pcre.vcproj" /build "Debug"
-cd %2\..\..\pcre
-copy Debug\pcre.dll
-copy Debug\pcre.lib
-copy pcre.dll %2\..\
+copy Debug\pcre.dll %2\..\..\pcre
+copy Debug\pcre.lib %2\..\..\pcre
goto Common
@@ -120,10 +118,8 @@
cd %2\..\..\..\Externals\pcre\Win32
%msdev% "pcre.dsp" /make "pcre - Win32 Release"
%devenv% "pcre.vcproj" /build "MinSizeRel"
-cd %2\..\..\pcre
-copy MinSizeRel\pcre.dll
-copy MinSizeRel\pcre.lib
-copy pcre.dll %2\..\
+copy MinSizeRel\pcre.dll %2\..\..\pcre
+copy MinSizeRel\pcre.lib %2\..\..\pcre
goto Common
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-12-29 19:50:45
|
Revision: 7072
http://winmerge.svn.sourceforge.net/winmerge/?rev=7072&view=rev
Author: kimmov
Date: 2009-12-29 19:50:39 +0000 (Tue, 29 Dec 2009)
Log Message:
-----------
Remove custom CMake build steps from PCRE build.
Modified Paths:
--------------
trunk/Externals/pcre/Win32/pcre.vcproj
Modified: trunk/Externals/pcre/Win32/pcre.vcproj
===================================================================
--- trunk/Externals/pcre/Win32/pcre.vcproj 2009-12-29 19:46:40 UTC (rev 7071)
+++ trunk/Externals/pcre/Win32/pcre.vcproj 2009-12-29 19:50:39 UTC (rev 7072)
@@ -515,10 +515,10 @@
>
<Tool
Name="VCCustomBuildTool"
- Description="Building Custom Rule D:/Work/WinMerge/WinMerge_SVN/Externals/pcre/CMakeLists.txt"
- CommandLine=""C:\Program Files\CMake 2.8\bin\cmake.exe" -HD:/Work/WinMerge/WinMerge_SVN/Externals/pcre -B. --check-stamp-file CMakeFiles/generate.stamp
"
- AdditionalDependencies="..\CMakeLists.txt;.\CMakeFiles\CMakeSystem.cmake;.\CMakeFiles\CMakeCCompiler.cmake;.\CMakeFiles\CMakeCXXCompiler.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeSystemSpecificInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeGenericSystem.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\gcc.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\Windows.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\WindowsPaths.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\Windows-cl.cmake";.\CMakeFiles\CMakeCPlatform.cmake;.\CMakeFiles\CMakeCXXPlatform.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\cl.cmake";.\CMakeFiles\CMakeRCCompiler.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeRCInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCommonLanguageInclude.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCXXInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCommonLanguageInclude.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\FindBZip2.cmake";..\cmake\FindPackageHandleStandardArgs.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\FindZLIB.cmake";..\cmake\FindPackageHandleStandardArgs.cmake;..\cmake\FindReadline.cmake;..\cmake\FindPackageHandleStandardArgs.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckIncludeFile.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckIncludeFileCXX.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckFunctionExists.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckTypeSize.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckIncludeFile.cmake";..\config-cmake.h.in;..\pcre.h.generic;..\pcre_stringpiece.h.in;..\pcrecpparg.h.in;..\pcre_chartables.c.dist;..\CMakeLists.txt;"
- Outputs="CMakeFiles\generate.stamp"
+ Description=""
+ CommandLine=""
+ AdditionalDependencies=""
+ Outputs=""
/>
</FileConfiguration>
<FileConfiguration
@@ -526,10 +526,10 @@
>
<Tool
Name="VCCustomBuildTool"
- Description="Building Custom Rule D:/Work/WinMerge/WinMerge_SVN/Externals/pcre/CMakeLists.txt"
- CommandLine=""C:\Program Files\CMake 2.8\bin\cmake.exe" -HD:/Work/WinMerge/WinMerge_SVN/Externals/pcre -B. --check-stamp-file CMakeFiles/generate.stamp
"
- AdditionalDependencies="..\CMakeLists.txt;.\CMakeFiles\CMakeSystem.cmake;.\CMakeFiles\CMakeCCompiler.cmake;.\CMakeFiles\CMakeCXXCompiler.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeSystemSpecificInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeGenericSystem.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\gcc.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\Windows.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\WindowsPaths.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\Windows-cl.cmake";.\CMakeFiles\CMakeCPlatform.cmake;.\CMakeFiles\CMakeCXXPlatform.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\cl.cmake";.\CMakeFiles\CMakeRCCompiler.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeRCInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCommonLanguageInclude.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCXXInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCommonLanguageInclude.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\FindBZip2.cmake";..\cmake\FindPackageHandleStandardArgs.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\FindZLIB.cmake";..\cmake\FindPackageHandleStandardArgs.cmake;..\cmake\FindReadline.cmake;..\cmake\FindPackageHandleStandardArgs.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckIncludeFile.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckIncludeFileCXX.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckFunctionExists.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckTypeSize.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckIncludeFile.cmake";..\config-cmake.h.in;..\pcre.h.generic;..\pcre_stringpiece.h.in;..\pcrecpparg.h.in;..\pcre_chartables.c.dist;..\CMakeLists.txt;"
- Outputs="CMakeFiles\generate.stamp"
+ Description=""
+ CommandLine=""
+ AdditionalDependencies=""
+ Outputs=""
/>
</FileConfiguration>
<FileConfiguration
@@ -548,10 +548,10 @@
>
<Tool
Name="VCCustomBuildTool"
- Description="Building Custom Rule D:/Work/WinMerge/WinMerge_SVN/Externals/pcre/CMakeLists.txt"
- CommandLine=""C:\Program Files\CMake 2.8\bin\cmake.exe" -HD:/Work/WinMerge/WinMerge_SVN/Externals/pcre -B. --check-stamp-file CMakeFiles/generate.stamp
"
- AdditionalDependencies="..\CMakeLists.txt;.\CMakeFiles\CMakeSystem.cmake;.\CMakeFiles\CMakeCCompiler.cmake;.\CMakeFiles\CMakeCXXCompiler.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeSystemSpecificInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeGenericSystem.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\gcc.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\Windows.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\WindowsPaths.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\Windows-cl.cmake";.\CMakeFiles\CMakeCPlatform.cmake;.\CMakeFiles\CMakeCXXPlatform.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\cl.cmake";.\CMakeFiles\CMakeRCCompiler.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeRCInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCommonLanguageInclude.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCXXInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCommonLanguageInclude.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\FindBZip2.cmake";..\cmake\FindPackageHandleStandardArgs.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\FindZLIB.cmake";..\cmake\FindPackageHandleStandardArgs.cmake;..\cmake\FindReadline.cmake;..\cmake\FindPackageHandleStandardArgs.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckIncludeFile.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckIncludeFileCXX.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckFunctionExists.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckTypeSize.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckIncludeFile.cmake";..\config-cmake.h.in;..\pcre.h.generic;..\pcre_stringpiece.h.in;..\pcrecpparg.h.in;..\pcre_chartables.c.dist;..\CMakeLists.txt;"
- Outputs="CMakeFiles\generate.stamp"
+ Description=""
+ CommandLine=""
+ AdditionalDependencies=""
+ Outputs=""
/>
</FileConfiguration>
</File>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-12-29 19:46:46
|
Revision: 7071
http://winmerge.svn.sourceforge.net/winmerge/?rev=7071&view=rev
Author: kimmov
Date: 2009-12-29 19:46:40 +0000 (Tue, 29 Dec 2009)
Log Message:
-----------
Remove PCRE solution file.
Visual Studio is too smart and forces opening the solution if solution file
exists in the folder. I just want to build one project.
Removed Paths:
-------------
trunk/Externals/pcre/Win32/PCRE_allbuild_solution.sln
Deleted: trunk/Externals/pcre/Win32/PCRE_allbuild_solution.sln
===================================================================
--- trunk/Externals/pcre/Win32/PCRE_allbuild_solution.sln 2009-12-29 19:26:44 UTC (rev 7070)
+++ trunk/Externals/pcre/Win32/PCRE_allbuild_solution.sln 2009-12-29 19:46:40 UTC (rev 7071)
@@ -1,182 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ALL_BUILD", ".\ALL_BUILD.vcproj", "{8EA48733-5246-4479-AC13-94A899A510BF}"
- ProjectSection(ProjectDependencies) = postProject
- {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC} = {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC}
- {F7E6A782-1C15-46E3-B645-922494B9F146} = {F7E6A782-1C15-46E3-B645-922494B9F146}
- {164D50FF-783C-486F-9B07-D3D68DC96D99} = {164D50FF-783C-486F-9B07-D3D68DC96D99}
- {C4C8D796-13C0-40C0-9A8F-75BA1AB5DEEE} = {C4C8D796-13C0-40C0-9A8F-75BA1AB5DEEE}
- {1D12D1F3-C077-4443-8F26-024D63AFD5B6} = {1D12D1F3-C077-4443-8F26-024D63AFD5B6}
- {866FCC80-8127-40FF-9F2A-FDEBDD4871A3} = {866FCC80-8127-40FF-9F2A-FDEBDD4871A3}
- {C755EFD1-85CA-4BBA-A7D3-5E8C06673C61} = {C755EFD1-85CA-4BBA-A7D3-5E8C06673C61}
- {BF19C1B7-362C-4F10-9DA1-F142D1DA633E} = {BF19C1B7-362C-4F10-9DA1-F142D1DA633E}
- {6C80CEA6-BD35-4258-99E9-BBA6C7E7B745} = {6C80CEA6-BD35-4258-99E9-BBA6C7E7B745}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "INSTALL", ".\INSTALL.vcproj", "{C3E33D1A-F3FA-4F04-B14D-D5F413C20F34}"
- ProjectSection(ProjectDependencies) = postProject
- {8EA48733-5246-4479-AC13-94A899A510BF} = {8EA48733-5246-4479-AC13-94A899A510BF}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RUN_TESTS", ".\RUN_TESTS.vcproj", "{F734992B-C147-4FF3-89DA-4A6D747CD9F3}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZERO_CHECK", ".\ZERO_CHECK.vcproj", "{3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pcre", ".\pcre.vcproj", "{F7E6A782-1C15-46E3-B645-922494B9F146}"
- ProjectSection(ProjectDependencies) = postProject
- {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC} = {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pcre_scanner_unittest", ".\pcre_scanner_unittest.vcproj", "{164D50FF-783C-486F-9B07-D3D68DC96D99}"
- ProjectSection(ProjectDependencies) = postProject
- {1D12D1F3-C077-4443-8F26-024D63AFD5B6} = {1D12D1F3-C077-4443-8F26-024D63AFD5B6}
- {F7E6A782-1C15-46E3-B645-922494B9F146} = {F7E6A782-1C15-46E3-B645-922494B9F146}
- {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC} = {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pcre_stringpiece_unittest", ".\pcre_stringpiece_unittest.vcproj", "{C4C8D796-13C0-40C0-9A8F-75BA1AB5DEEE}"
- ProjectSection(ProjectDependencies) = postProject
- {1D12D1F3-C077-4443-8F26-024D63AFD5B6} = {1D12D1F3-C077-4443-8F26-024D63AFD5B6}
- {F7E6A782-1C15-46E3-B645-922494B9F146} = {F7E6A782-1C15-46E3-B645-922494B9F146}
- {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC} = {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pcrecpp", ".\pcrecpp.vcproj", "{1D12D1F3-C077-4443-8F26-024D63AFD5B6}"
- ProjectSection(ProjectDependencies) = postProject
- {F7E6A782-1C15-46E3-B645-922494B9F146} = {F7E6A782-1C15-46E3-B645-922494B9F146}
- {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC} = {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pcrecpp_unittest", ".\pcrecpp_unittest.vcproj", "{866FCC80-8127-40FF-9F2A-FDEBDD4871A3}"
- ProjectSection(ProjectDependencies) = postProject
- {1D12D1F3-C077-4443-8F26-024D63AFD5B6} = {1D12D1F3-C077-4443-8F26-024D63AFD5B6}
- {F7E6A782-1C15-46E3-B645-922494B9F146} = {F7E6A782-1C15-46E3-B645-922494B9F146}
- {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC} = {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pcregrep", ".\pcregrep.vcproj", "{C755EFD1-85CA-4BBA-A7D3-5E8C06673C61}"
- ProjectSection(ProjectDependencies) = postProject
- {BF19C1B7-362C-4F10-9DA1-F142D1DA633E} = {BF19C1B7-362C-4F10-9DA1-F142D1DA633E}
- {F7E6A782-1C15-46E3-B645-922494B9F146} = {F7E6A782-1C15-46E3-B645-922494B9F146}
- {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC} = {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pcreposix", ".\pcreposix.vcproj", "{BF19C1B7-362C-4F10-9DA1-F142D1DA633E}"
- ProjectSection(ProjectDependencies) = postProject
- {F7E6A782-1C15-46E3-B645-922494B9F146} = {F7E6A782-1C15-46E3-B645-922494B9F146}
- {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC} = {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pcretest", ".\pcretest.vcproj", "{6C80CEA6-BD35-4258-99E9-BBA6C7E7B745}"
- ProjectSection(ProjectDependencies) = postProject
- {BF19C1B7-362C-4F10-9DA1-F142D1DA633E} = {BF19C1B7-362C-4F10-9DA1-F142D1DA633E}
- {F7E6A782-1C15-46E3-B645-922494B9F146} = {F7E6A782-1C15-46E3-B645-922494B9F146}
- {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC} = {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC}
- EndProjectSection
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Release|Win32 = Release|Win32
- MinSizeRel|Win32 = MinSizeRel|Win32
- RelWithDebInfo|Win32 = RelWithDebInfo|Win32
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {8EA48733-5246-4479-AC13-94A899A510BF}.Debug|Win32.ActiveCfg = Debug|Win32
- {8EA48733-5246-4479-AC13-94A899A510BF}.Debug|Win32.Build.0 = Debug|Win32
- {8EA48733-5246-4479-AC13-94A899A510BF}.Release|Win32.ActiveCfg = Release|Win32
- {8EA48733-5246-4479-AC13-94A899A510BF}.Release|Win32.Build.0 = Release|Win32
- {8EA48733-5246-4479-AC13-94A899A510BF}.MinSizeRel|Win32.ActiveCfg = MinSizeRel|Win32
- {8EA48733-5246-4479-AC13-94A899A510BF}.MinSizeRel|Win32.Build.0 = MinSizeRel|Win32
- {8EA48733-5246-4479-AC13-94A899A510BF}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|Win32
- {8EA48733-5246-4479-AC13-94A899A510BF}.RelWithDebInfo|Win32.Build.0 = RelWithDebInfo|Win32
- {C3E33D1A-F3FA-4F04-B14D-D5F413C20F34}.Debug|Win32.ActiveCfg = Debug|Win32
- {C3E33D1A-F3FA-4F04-B14D-D5F413C20F34}.Release|Win32.ActiveCfg = Release|Win32
- {C3E33D1A-F3FA-4F04-B14D-D5F413C20F34}.MinSizeRel|Win32.ActiveCfg = MinSizeRel|Win32
- {C3E33D1A-F3FA-4F04-B14D-D5F413C20F34}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|Win32
- {F734992B-C147-4FF3-89DA-4A6D747CD9F3}.Debug|Win32.ActiveCfg = Debug|Win32
- {F734992B-C147-4FF3-89DA-4A6D747CD9F3}.Release|Win32.ActiveCfg = Release|Win32
- {F734992B-C147-4FF3-89DA-4A6D747CD9F3}.MinSizeRel|Win32.ActiveCfg = MinSizeRel|Win32
- {F734992B-C147-4FF3-89DA-4A6D747CD9F3}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|Win32
- {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC}.Debug|Win32.ActiveCfg = Debug|Win32
- {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC}.Debug|Win32.Build.0 = Debug|Win32
- {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC}.Release|Win32.ActiveCfg = Release|Win32
- {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC}.Release|Win32.Build.0 = Release|Win32
- {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC}.MinSizeRel|Win32.ActiveCfg = MinSizeRel|Win32
- {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC}.MinSizeRel|Win32.Build.0 = MinSizeRel|Win32
- {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|Win32
- {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC}.RelWithDebInfo|Win32.Build.0 = RelWithDebInfo|Win32
- {F7E6A782-1C15-46E3-B645-922494B9F146}.Debug|Win32.ActiveCfg = Debug|Win32
- {F7E6A782-1C15-46E3-B645-922494B9F146}.Debug|Win32.Build.0 = Debug|Win32
- {F7E6A782-1C15-46E3-B645-922494B9F146}.Release|Win32.ActiveCfg = Release|Win32
- {F7E6A782-1C15-46E3-B645-922494B9F146}.Release|Win32.Build.0 = Release|Win32
- {F7E6A782-1C15-46E3-B645-922494B9F146}.MinSizeRel|Win32.ActiveCfg = MinSizeRel|Win32
- {F7E6A782-1C15-46E3-B645-922494B9F146}.MinSizeRel|Win32.Build.0 = MinSizeRel|Win32
- {F7E6A782-1C15-46E3-B645-922494B9F146}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|Win32
- {F7E6A782-1C15-46E3-B645-922494B9F146}.RelWithDebInfo|Win32.Build.0 = RelWithDebInfo|Win32
- {164D50FF-783C-486F-9B07-D3D68DC96D99}.Debug|Win32.ActiveCfg = Debug|Win32
- {164D50FF-783C-486F-9B07-D3D68DC96D99}.Debug|Win32.Build.0 = Debug|Win32
- {164D50FF-783C-486F-9B07-D3D68DC96D99}.Release|Win32.ActiveCfg = Release|Win32
- {164D50FF-783C-486F-9B07-D3D68DC96D99}.Release|Win32.Build.0 = Release|Win32
- {164D50FF-783C-486F-9B07-D3D68DC96D99}.MinSizeRel|Win32.ActiveCfg = MinSizeRel|Win32
- {164D50FF-783C-486F-9B07-D3D68DC96D99}.MinSizeRel|Win32.Build.0 = MinSizeRel|Win32
- {164D50FF-783C-486F-9B07-D3D68DC96D99}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|Win32
- {164D50FF-783C-486F-9B07-D3D68DC96D99}.RelWithDebInfo|Win32.Build.0 = RelWithDebInfo|Win32
- {C4C8D796-13C0-40C0-9A8F-75BA1AB5DEEE}.Debug|Win32.ActiveCfg = Debug|Win32
- {C4C8D796-13C0-40C0-9A8F-75BA1AB5DEEE}.Debug|Win32.Build.0 = Debug|Win32
- {C4C8D796-13C0-40C0-9A8F-75BA1AB5DEEE}.Release|Win32.ActiveCfg = Release|Win32
- {C4C8D796-13C0-40C0-9A8F-75BA1AB5DEEE}.Release|Win32.Build.0 = Release|Win32
- {C4C8D796-13C0-40C0-9A8F-75BA1AB5DEEE}.MinSizeRel|Win32.ActiveCfg = MinSizeRel|Win32
- {C4C8D796-13C0-40C0-9A8F-75BA1AB5DEEE}.MinSizeRel|Win32.Build.0 = MinSizeRel|Win32
- {C4C8D796-13C0-40C0-9A8F-75BA1AB5DEEE}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|Win32
- {C4C8D796-13C0-40C0-9A8F-75BA1AB5DEEE}.RelWithDebInfo|Win32.Build.0 = RelWithDebInfo|Win32
- {1D12D1F3-C077-4443-8F26-024D63AFD5B6}.Debug|Win32.ActiveCfg = Debug|Win32
- {1D12D1F3-C077-4443-8F26-024D63AFD5B6}.Debug|Win32.Build.0 = Debug|Win32
- {1D12D1F3-C077-4443-8F26-024D63AFD5B6}.Release|Win32.ActiveCfg = Release|Win32
- {1D12D1F3-C077-4443-8F26-024D63AFD5B6}.Release|Win32.Build.0 = Release|Win32
- {1D12D1F3-C077-4443-8F26-024D63AFD5B6}.MinSizeRel|Win32.ActiveCfg = MinSizeRel|Win32
- {1D12D1F3-C077-4443-8F26-024D63AFD5B6}.MinSizeRel|Win32.Build.0 = MinSizeRel|Win32
- {1D12D1F3-C077-4443-8F26-024D63AFD5B6}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|Win32
- {1D12D1F3-C077-4443-8F26-024D63AFD5B6}.RelWithDebInfo|Win32.Build.0 = RelWithDebInfo|Win32
- {866FCC80-8127-40FF-9F2A-FDEBDD4871A3}.Debug|Win32.ActiveCfg = Debug|Win32
- {866FCC80-8127-40FF-9F2A-FDEBDD4871A3}.Debug|Win32.Build.0 = Debug|Win32
- {866FCC80-8127-40FF-9F2A-FDEBDD4871A3}.Release|Win32.ActiveCfg = Release|Win32
- {866FCC80-8127-40FF-9F2A-FDEBDD4871A3}.Release|Win32.Build.0 = Release|Win32
- {866FCC80-8127-40FF-9F2A-FDEBDD4871A3}.MinSizeRel|Win32.ActiveCfg = MinSizeRel|Win32
- {866FCC80-8127-40FF-9F2A-FDEBDD4871A3}.MinSizeRel|Win32.Build.0 = MinSizeRel|Win32
- {866FCC80-8127-40FF-9F2A-FDEBDD4871A3}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|Win32
- {866FCC80-8127-40FF-9F2A-FDEBDD4871A3}.RelWithDebInfo|Win32.Build.0 = RelWithDebInfo|Win32
- {C755EFD1-85CA-4BBA-A7D3-5E8C06673C61}.Debug|Win32.ActiveCfg = Debug|Win32
- {C755EFD1-85CA-4BBA-A7D3-5E8C06673C61}.Debug|Win32.Build.0 = Debug|Win32
- {C755EFD1-85CA-4BBA-A7D3-5E8C06673C61}.Release|Win32.ActiveCfg = Release|Win32
- {C755EFD1-85CA-4BBA-A7D3-5E8C06673C61}.Release|Win32.Build.0 = Release|Win32
- {C755EFD1-85CA-4BBA-A7D3-5E8C06673C61}.MinSizeRel|Win32.ActiveCfg = MinSizeRel|Win32
- {C755EFD1-85CA-4BBA-A7D3-5E8C06673C61}.MinSizeRel|Win32.Build.0 = MinSizeRel|Win32
- {C755EFD1-85CA-4BBA-A7D3-5E8C06673C61}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|Win32
- {C755EFD1-85CA-4BBA-A7D3-5E8C06673C61}.RelWithDebInfo|Win32.Build.0 = RelWithDebInfo|Win32
- {BF19C1B7-362C-4F10-9DA1-F142D1DA633E}.Debug|Win32.ActiveCfg = Debug|Win32
- {BF19C1B7-362C-4F10-9DA1-F142D1DA633E}.Debug|Win32.Build.0 = Debug|Win32
- {BF19C1B7-362C-4F10-9DA1-F142D1DA633E}.Release|Win32.ActiveCfg = Release|Win32
- {BF19C1B7-362C-4F10-9DA1-F142D1DA633E}.Release|Win32.Build.0 = Release|Win32
- {BF19C1B7-362C-4F10-9DA1-F142D1DA633E}.MinSizeRel|Win32.ActiveCfg = MinSizeRel|Win32
- {BF19C1B7-362C-4F10-9DA1-F142D1DA633E}.MinSizeRel|Win32.Build.0 = MinSizeRel|Win32
- {BF19C1B7-362C-4F10-9DA1-F142D1DA633E}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|Win32
- {BF19C1B7-362C-4F10-9DA1-F142D1DA633E}.RelWithDebInfo|Win32.Build.0 = RelWithDebInfo|Win32
- {6C80CEA6-BD35-4258-99E9-BBA6C7E7B745}.Debug|Win32.ActiveCfg = Debug|Win32
- {6C80CEA6-BD35-4258-99E9-BBA6C7E7B745}.Debug|Win32.Build.0 = Debug|Win32
- {6C80CEA6-BD35-4258-99E9-BBA6C7E7B745}.Release|Win32.ActiveCfg = Release|Win32
- {6C80CEA6-BD35-4258-99E9-BBA6C7E7B745}.Release|Win32.Build.0 = Release|Win32
- {6C80CEA6-BD35-4258-99E9-BBA6C7E7B745}.MinSizeRel|Win32.ActiveCfg = MinSizeRel|Win32
- {6C80CEA6-BD35-4258-99E9-BBA6C7E7B745}.MinSizeRel|Win32.Build.0 = MinSizeRel|Win32
- {6C80CEA6-BD35-4258-99E9-BBA6C7E7B745}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|Win32
- {6C80CEA6-BD35-4258-99E9-BBA6C7E7B745}.RelWithDebInfo|Win32.Build.0 = RelWithDebInfo|Win32
- EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- EndGlobalSection
- GlobalSection(ExtensibilityAddIns) = postSolution
- EndGlobalSection
-EndGlobal
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-12-29 19:26:51
|
Revision: 7070
http://winmerge.svn.sourceforge.net/winmerge/?rev=7070&view=rev
Author: kimmov
Date: 2009-12-29 19:26:44 +0000 (Tue, 29 Dec 2009)
Log Message:
-----------
Rename PCRE solution file to be able to build just library project. Rename debug library to not have d-postix in name.
Modified Paths:
--------------
trunk/Externals/pcre/Win32/pcre.vcproj
Added Paths:
-----------
trunk/Externals/pcre/Win32/PCRE_allbuild_solution.sln
Removed Paths:
-------------
trunk/Externals/pcre/Win32/PCRE.sln
Deleted: trunk/Externals/pcre/Win32/PCRE.sln
===================================================================
--- trunk/Externals/pcre/Win32/PCRE.sln 2009-12-29 18:39:32 UTC (rev 7069)
+++ trunk/Externals/pcre/Win32/PCRE.sln 2009-12-29 19:26:44 UTC (rev 7070)
@@ -1,182 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ALL_BUILD", ".\ALL_BUILD.vcproj", "{8EA48733-5246-4479-AC13-94A899A510BF}"
- ProjectSection(ProjectDependencies) = postProject
- {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC} = {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC}
- {F7E6A782-1C15-46E3-B645-922494B9F146} = {F7E6A782-1C15-46E3-B645-922494B9F146}
- {164D50FF-783C-486F-9B07-D3D68DC96D99} = {164D50FF-783C-486F-9B07-D3D68DC96D99}
- {C4C8D796-13C0-40C0-9A8F-75BA1AB5DEEE} = {C4C8D796-13C0-40C0-9A8F-75BA1AB5DEEE}
- {1D12D1F3-C077-4443-8F26-024D63AFD5B6} = {1D12D1F3-C077-4443-8F26-024D63AFD5B6}
- {866FCC80-8127-40FF-9F2A-FDEBDD4871A3} = {866FCC80-8127-40FF-9F2A-FDEBDD4871A3}
- {C755EFD1-85CA-4BBA-A7D3-5E8C06673C61} = {C755EFD1-85CA-4BBA-A7D3-5E8C06673C61}
- {BF19C1B7-362C-4F10-9DA1-F142D1DA633E} = {BF19C1B7-362C-4F10-9DA1-F142D1DA633E}
- {6C80CEA6-BD35-4258-99E9-BBA6C7E7B745} = {6C80CEA6-BD35-4258-99E9-BBA6C7E7B745}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "INSTALL", ".\INSTALL.vcproj", "{C3E33D1A-F3FA-4F04-B14D-D5F413C20F34}"
- ProjectSection(ProjectDependencies) = postProject
- {8EA48733-5246-4479-AC13-94A899A510BF} = {8EA48733-5246-4479-AC13-94A899A510BF}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RUN_TESTS", ".\RUN_TESTS.vcproj", "{F734992B-C147-4FF3-89DA-4A6D747CD9F3}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZERO_CHECK", ".\ZERO_CHECK.vcproj", "{3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pcre", ".\pcre.vcproj", "{F7E6A782-1C15-46E3-B645-922494B9F146}"
- ProjectSection(ProjectDependencies) = postProject
- {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC} = {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pcre_scanner_unittest", ".\pcre_scanner_unittest.vcproj", "{164D50FF-783C-486F-9B07-D3D68DC96D99}"
- ProjectSection(ProjectDependencies) = postProject
- {1D12D1F3-C077-4443-8F26-024D63AFD5B6} = {1D12D1F3-C077-4443-8F26-024D63AFD5B6}
- {F7E6A782-1C15-46E3-B645-922494B9F146} = {F7E6A782-1C15-46E3-B645-922494B9F146}
- {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC} = {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pcre_stringpiece_unittest", ".\pcre_stringpiece_unittest.vcproj", "{C4C8D796-13C0-40C0-9A8F-75BA1AB5DEEE}"
- ProjectSection(ProjectDependencies) = postProject
- {1D12D1F3-C077-4443-8F26-024D63AFD5B6} = {1D12D1F3-C077-4443-8F26-024D63AFD5B6}
- {F7E6A782-1C15-46E3-B645-922494B9F146} = {F7E6A782-1C15-46E3-B645-922494B9F146}
- {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC} = {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pcrecpp", ".\pcrecpp.vcproj", "{1D12D1F3-C077-4443-8F26-024D63AFD5B6}"
- ProjectSection(ProjectDependencies) = postProject
- {F7E6A782-1C15-46E3-B645-922494B9F146} = {F7E6A782-1C15-46E3-B645-922494B9F146}
- {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC} = {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pcrecpp_unittest", ".\pcrecpp_unittest.vcproj", "{866FCC80-8127-40FF-9F2A-FDEBDD4871A3}"
- ProjectSection(ProjectDependencies) = postProject
- {1D12D1F3-C077-4443-8F26-024D63AFD5B6} = {1D12D1F3-C077-4443-8F26-024D63AFD5B6}
- {F7E6A782-1C15-46E3-B645-922494B9F146} = {F7E6A782-1C15-46E3-B645-922494B9F146}
- {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC} = {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pcregrep", ".\pcregrep.vcproj", "{C755EFD1-85CA-4BBA-A7D3-5E8C06673C61}"
- ProjectSection(ProjectDependencies) = postProject
- {BF19C1B7-362C-4F10-9DA1-F142D1DA633E} = {BF19C1B7-362C-4F10-9DA1-F142D1DA633E}
- {F7E6A782-1C15-46E3-B645-922494B9F146} = {F7E6A782-1C15-46E3-B645-922494B9F146}
- {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC} = {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pcreposix", ".\pcreposix.vcproj", "{BF19C1B7-362C-4F10-9DA1-F142D1DA633E}"
- ProjectSection(ProjectDependencies) = postProject
- {F7E6A782-1C15-46E3-B645-922494B9F146} = {F7E6A782-1C15-46E3-B645-922494B9F146}
- {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC} = {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pcretest", ".\pcretest.vcproj", "{6C80CEA6-BD35-4258-99E9-BBA6C7E7B745}"
- ProjectSection(ProjectDependencies) = postProject
- {BF19C1B7-362C-4F10-9DA1-F142D1DA633E} = {BF19C1B7-362C-4F10-9DA1-F142D1DA633E}
- {F7E6A782-1C15-46E3-B645-922494B9F146} = {F7E6A782-1C15-46E3-B645-922494B9F146}
- {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC} = {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC}
- EndProjectSection
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Release|Win32 = Release|Win32
- MinSizeRel|Win32 = MinSizeRel|Win32
- RelWithDebInfo|Win32 = RelWithDebInfo|Win32
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {8EA48733-5246-4479-AC13-94A899A510BF}.Debug|Win32.ActiveCfg = Debug|Win32
- {8EA48733-5246-4479-AC13-94A899A510BF}.Debug|Win32.Build.0 = Debug|Win32
- {8EA48733-5246-4479-AC13-94A899A510BF}.Release|Win32.ActiveCfg = Release|Win32
- {8EA48733-5246-4479-AC13-94A899A510BF}.Release|Win32.Build.0 = Release|Win32
- {8EA48733-5246-4479-AC13-94A899A510BF}.MinSizeRel|Win32.ActiveCfg = MinSizeRel|Win32
- {8EA48733-5246-4479-AC13-94A899A510BF}.MinSizeRel|Win32.Build.0 = MinSizeRel|Win32
- {8EA48733-5246-4479-AC13-94A899A510BF}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|Win32
- {8EA48733-5246-4479-AC13-94A899A510BF}.RelWithDebInfo|Win32.Build.0 = RelWithDebInfo|Win32
- {C3E33D1A-F3FA-4F04-B14D-D5F413C20F34}.Debug|Win32.ActiveCfg = Debug|Win32
- {C3E33D1A-F3FA-4F04-B14D-D5F413C20F34}.Release|Win32.ActiveCfg = Release|Win32
- {C3E33D1A-F3FA-4F04-B14D-D5F413C20F34}.MinSizeRel|Win32.ActiveCfg = MinSizeRel|Win32
- {C3E33D1A-F3FA-4F04-B14D-D5F413C20F34}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|Win32
- {F734992B-C147-4FF3-89DA-4A6D747CD9F3}.Debug|Win32.ActiveCfg = Debug|Win32
- {F734992B-C147-4FF3-89DA-4A6D747CD9F3}.Release|Win32.ActiveCfg = Release|Win32
- {F734992B-C147-4FF3-89DA-4A6D747CD9F3}.MinSizeRel|Win32.ActiveCfg = MinSizeRel|Win32
- {F734992B-C147-4FF3-89DA-4A6D747CD9F3}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|Win32
- {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC}.Debug|Win32.ActiveCfg = Debug|Win32
- {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC}.Debug|Win32.Build.0 = Debug|Win32
- {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC}.Release|Win32.ActiveCfg = Release|Win32
- {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC}.Release|Win32.Build.0 = Release|Win32
- {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC}.MinSizeRel|Win32.ActiveCfg = MinSizeRel|Win32
- {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC}.MinSizeRel|Win32.Build.0 = MinSizeRel|Win32
- {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|Win32
- {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC}.RelWithDebInfo|Win32.Build.0 = RelWithDebInfo|Win32
- {F7E6A782-1C15-46E3-B645-922494B9F146}.Debug|Win32.ActiveCfg = Debug|Win32
- {F7E6A782-1C15-46E3-B645-922494B9F146}.Debug|Win32.Build.0 = Debug|Win32
- {F7E6A782-1C15-46E3-B645-922494B9F146}.Release|Win32.ActiveCfg = Release|Win32
- {F7E6A782-1C15-46E3-B645-922494B9F146}.Release|Win32.Build.0 = Release|Win32
- {F7E6A782-1C15-46E3-B645-922494B9F146}.MinSizeRel|Win32.ActiveCfg = MinSizeRel|Win32
- {F7E6A782-1C15-46E3-B645-922494B9F146}.MinSizeRel|Win32.Build.0 = MinSizeRel|Win32
- {F7E6A782-1C15-46E3-B645-922494B9F146}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|Win32
- {F7E6A782-1C15-46E3-B645-922494B9F146}.RelWithDebInfo|Win32.Build.0 = RelWithDebInfo|Win32
- {164D50FF-783C-486F-9B07-D3D68DC96D99}.Debug|Win32.ActiveCfg = Debug|Win32
- {164D50FF-783C-486F-9B07-D3D68DC96D99}.Debug|Win32.Build.0 = Debug|Win32
- {164D50FF-783C-486F-9B07-D3D68DC96D99}.Release|Win32.ActiveCfg = Release|Win32
- {164D50FF-783C-486F-9B07-D3D68DC96D99}.Release|Win32.Build.0 = Release|Win32
- {164D50FF-783C-486F-9B07-D3D68DC96D99}.MinSizeRel|Win32.ActiveCfg = MinSizeRel|Win32
- {164D50FF-783C-486F-9B07-D3D68DC96D99}.MinSizeRel|Win32.Build.0 = MinSizeRel|Win32
- {164D50FF-783C-486F-9B07-D3D68DC96D99}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|Win32
- {164D50FF-783C-486F-9B07-D3D68DC96D99}.RelWithDebInfo|Win32.Build.0 = RelWithDebInfo|Win32
- {C4C8D796-13C0-40C0-9A8F-75BA1AB5DEEE}.Debug|Win32.ActiveCfg = Debug|Win32
- {C4C8D796-13C0-40C0-9A8F-75BA1AB5DEEE}.Debug|Win32.Build.0 = Debug|Win32
- {C4C8D796-13C0-40C0-9A8F-75BA1AB5DEEE}.Release|Win32.ActiveCfg = Release|Win32
- {C4C8D796-13C0-40C0-9A8F-75BA1AB5DEEE}.Release|Win32.Build.0 = Release|Win32
- {C4C8D796-13C0-40C0-9A8F-75BA1AB5DEEE}.MinSizeRel|Win32.ActiveCfg = MinSizeRel|Win32
- {C4C8D796-13C0-40C0-9A8F-75BA1AB5DEEE}.MinSizeRel|Win32.Build.0 = MinSizeRel|Win32
- {C4C8D796-13C0-40C0-9A8F-75BA1AB5DEEE}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|Win32
- {C4C8D796-13C0-40C0-9A8F-75BA1AB5DEEE}.RelWithDebInfo|Win32.Build.0 = RelWithDebInfo|Win32
- {1D12D1F3-C077-4443-8F26-024D63AFD5B6}.Debug|Win32.ActiveCfg = Debug|Win32
- {1D12D1F3-C077-4443-8F26-024D63AFD5B6}.Debug|Win32.Build.0 = Debug|Win32
- {1D12D1F3-C077-4443-8F26-024D63AFD5B6}.Release|Win32.ActiveCfg = Release|Win32
- {1D12D1F3-C077-4443-8F26-024D63AFD5B6}.Release|Win32.Build.0 = Release|Win32
- {1D12D1F3-C077-4443-8F26-024D63AFD5B6}.MinSizeRel|Win32.ActiveCfg = MinSizeRel|Win32
- {1D12D1F3-C077-4443-8F26-024D63AFD5B6}.MinSizeRel|Win32.Build.0 = MinSizeRel|Win32
- {1D12D1F3-C077-4443-8F26-024D63AFD5B6}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|Win32
- {1D12D1F3-C077-4443-8F26-024D63AFD5B6}.RelWithDebInfo|Win32.Build.0 = RelWithDebInfo|Win32
- {866FCC80-8127-40FF-9F2A-FDEBDD4871A3}.Debug|Win32.ActiveCfg = Debug|Win32
- {866FCC80-8127-40FF-9F2A-FDEBDD4871A3}.Debug|Win32.Build.0 = Debug|Win32
- {866FCC80-8127-40FF-9F2A-FDEBDD4871A3}.Release|Win32.ActiveCfg = Release|Win32
- {866FCC80-8127-40FF-9F2A-FDEBDD4871A3}.Release|Win32.Build.0 = Release|Win32
- {866FCC80-8127-40FF-9F2A-FDEBDD4871A3}.MinSizeRel|Win32.ActiveCfg = MinSizeRel|Win32
- {866FCC80-8127-40FF-9F2A-FDEBDD4871A3}.MinSizeRel|Win32.Build.0 = MinSizeRel|Win32
- {866FCC80-8127-40FF-9F2A-FDEBDD4871A3}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|Win32
- {866FCC80-8127-40FF-9F2A-FDEBDD4871A3}.RelWithDebInfo|Win32.Build.0 = RelWithDebInfo|Win32
- {C755EFD1-85CA-4BBA-A7D3-5E8C06673C61}.Debug|Win32.ActiveCfg = Debug|Win32
- {C755EFD1-85CA-4BBA-A7D3-5E8C06673C61}.Debug|Win32.Build.0 = Debug|Win32
- {C755EFD1-85CA-4BBA-A7D3-5E8C06673C61}.Release|Win32.ActiveCfg = Release|Win32
- {C755EFD1-85CA-4BBA-A7D3-5E8C06673C61}.Release|Win32.Build.0 = Release|Win32
- {C755EFD1-85CA-4BBA-A7D3-5E8C06673C61}.MinSizeRel|Win32.ActiveCfg = MinSizeRel|Win32
- {C755EFD1-85CA-4BBA-A7D3-5E8C06673C61}.MinSizeRel|Win32.Build.0 = MinSizeRel|Win32
- {C755EFD1-85CA-4BBA-A7D3-5E8C06673C61}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|Win32
- {C755EFD1-85CA-4BBA-A7D3-5E8C06673C61}.RelWithDebInfo|Win32.Build.0 = RelWithDebInfo|Win32
- {BF19C1B7-362C-4F10-9DA1-F142D1DA633E}.Debug|Win32.ActiveCfg = Debug|Win32
- {BF19C1B7-362C-4F10-9DA1-F142D1DA633E}.Debug|Win32.Build.0 = Debug|Win32
- {BF19C1B7-362C-4F10-9DA1-F142D1DA633E}.Release|Win32.ActiveCfg = Release|Win32
- {BF19C1B7-362C-4F10-9DA1-F142D1DA633E}.Release|Win32.Build.0 = Release|Win32
- {BF19C1B7-362C-4F10-9DA1-F142D1DA633E}.MinSizeRel|Win32.ActiveCfg = MinSizeRel|Win32
- {BF19C1B7-362C-4F10-9DA1-F142D1DA633E}.MinSizeRel|Win32.Build.0 = MinSizeRel|Win32
- {BF19C1B7-362C-4F10-9DA1-F142D1DA633E}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|Win32
- {BF19C1B7-362C-4F10-9DA1-F142D1DA633E}.RelWithDebInfo|Win32.Build.0 = RelWithDebInfo|Win32
- {6C80CEA6-BD35-4258-99E9-BBA6C7E7B745}.Debug|Win32.ActiveCfg = Debug|Win32
- {6C80CEA6-BD35-4258-99E9-BBA6C7E7B745}.Debug|Win32.Build.0 = Debug|Win32
- {6C80CEA6-BD35-4258-99E9-BBA6C7E7B745}.Release|Win32.ActiveCfg = Release|Win32
- {6C80CEA6-BD35-4258-99E9-BBA6C7E7B745}.Release|Win32.Build.0 = Release|Win32
- {6C80CEA6-BD35-4258-99E9-BBA6C7E7B745}.MinSizeRel|Win32.ActiveCfg = MinSizeRel|Win32
- {6C80CEA6-BD35-4258-99E9-BBA6C7E7B745}.MinSizeRel|Win32.Build.0 = MinSizeRel|Win32
- {6C80CEA6-BD35-4258-99E9-BBA6C7E7B745}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|Win32
- {6C80CEA6-BD35-4258-99E9-BBA6C7E7B745}.RelWithDebInfo|Win32.Build.0 = RelWithDebInfo|Win32
- EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- EndGlobalSection
- GlobalSection(ExtensibilityAddIns) = postSolution
- EndGlobalSection
-EndGlobal
Copied: trunk/Externals/pcre/Win32/PCRE_allbuild_solution.sln (from rev 7068, trunk/Externals/pcre/Win32/PCRE.sln)
===================================================================
--- trunk/Externals/pcre/Win32/PCRE_allbuild_solution.sln (rev 0)
+++ trunk/Externals/pcre/Win32/PCRE_allbuild_solution.sln 2009-12-29 19:26:44 UTC (rev 7070)
@@ -0,0 +1,182 @@
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ALL_BUILD", ".\ALL_BUILD.vcproj", "{8EA48733-5246-4479-AC13-94A899A510BF}"
+ ProjectSection(ProjectDependencies) = postProject
+ {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC} = {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC}
+ {F7E6A782-1C15-46E3-B645-922494B9F146} = {F7E6A782-1C15-46E3-B645-922494B9F146}
+ {164D50FF-783C-486F-9B07-D3D68DC96D99} = {164D50FF-783C-486F-9B07-D3D68DC96D99}
+ {C4C8D796-13C0-40C0-9A8F-75BA1AB5DEEE} = {C4C8D796-13C0-40C0-9A8F-75BA1AB5DEEE}
+ {1D12D1F3-C077-4443-8F26-024D63AFD5B6} = {1D12D1F3-C077-4443-8F26-024D63AFD5B6}
+ {866FCC80-8127-40FF-9F2A-FDEBDD4871A3} = {866FCC80-8127-40FF-9F2A-FDEBDD4871A3}
+ {C755EFD1-85CA-4BBA-A7D3-5E8C06673C61} = {C755EFD1-85CA-4BBA-A7D3-5E8C06673C61}
+ {BF19C1B7-362C-4F10-9DA1-F142D1DA633E} = {BF19C1B7-362C-4F10-9DA1-F142D1DA633E}
+ {6C80CEA6-BD35-4258-99E9-BBA6C7E7B745} = {6C80CEA6-BD35-4258-99E9-BBA6C7E7B745}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "INSTALL", ".\INSTALL.vcproj", "{C3E33D1A-F3FA-4F04-B14D-D5F413C20F34}"
+ ProjectSection(ProjectDependencies) = postProject
+ {8EA48733-5246-4479-AC13-94A899A510BF} = {8EA48733-5246-4479-AC13-94A899A510BF}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RUN_TESTS", ".\RUN_TESTS.vcproj", "{F734992B-C147-4FF3-89DA-4A6D747CD9F3}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZERO_CHECK", ".\ZERO_CHECK.vcproj", "{3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pcre", ".\pcre.vcproj", "{F7E6A782-1C15-46E3-B645-922494B9F146}"
+ ProjectSection(ProjectDependencies) = postProject
+ {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC} = {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pcre_scanner_unittest", ".\pcre_scanner_unittest.vcproj", "{164D50FF-783C-486F-9B07-D3D68DC96D99}"
+ ProjectSection(ProjectDependencies) = postProject
+ {1D12D1F3-C077-4443-8F26-024D63AFD5B6} = {1D12D1F3-C077-4443-8F26-024D63AFD5B6}
+ {F7E6A782-1C15-46E3-B645-922494B9F146} = {F7E6A782-1C15-46E3-B645-922494B9F146}
+ {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC} = {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pcre_stringpiece_unittest", ".\pcre_stringpiece_unittest.vcproj", "{C4C8D796-13C0-40C0-9A8F-75BA1AB5DEEE}"
+ ProjectSection(ProjectDependencies) = postProject
+ {1D12D1F3-C077-4443-8F26-024D63AFD5B6} = {1D12D1F3-C077-4443-8F26-024D63AFD5B6}
+ {F7E6A782-1C15-46E3-B645-922494B9F146} = {F7E6A782-1C15-46E3-B645-922494B9F146}
+ {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC} = {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pcrecpp", ".\pcrecpp.vcproj", "{1D12D1F3-C077-4443-8F26-024D63AFD5B6}"
+ ProjectSection(ProjectDependencies) = postProject
+ {F7E6A782-1C15-46E3-B645-922494B9F146} = {F7E6A782-1C15-46E3-B645-922494B9F146}
+ {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC} = {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pcrecpp_unittest", ".\pcrecpp_unittest.vcproj", "{866FCC80-8127-40FF-9F2A-FDEBDD4871A3}"
+ ProjectSection(ProjectDependencies) = postProject
+ {1D12D1F3-C077-4443-8F26-024D63AFD5B6} = {1D12D1F3-C077-4443-8F26-024D63AFD5B6}
+ {F7E6A782-1C15-46E3-B645-922494B9F146} = {F7E6A782-1C15-46E3-B645-922494B9F146}
+ {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC} = {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pcregrep", ".\pcregrep.vcproj", "{C755EFD1-85CA-4BBA-A7D3-5E8C06673C61}"
+ ProjectSection(ProjectDependencies) = postProject
+ {BF19C1B7-362C-4F10-9DA1-F142D1DA633E} = {BF19C1B7-362C-4F10-9DA1-F142D1DA633E}
+ {F7E6A782-1C15-46E3-B645-922494B9F146} = {F7E6A782-1C15-46E3-B645-922494B9F146}
+ {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC} = {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pcreposix", ".\pcreposix.vcproj", "{BF19C1B7-362C-4F10-9DA1-F142D1DA633E}"
+ ProjectSection(ProjectDependencies) = postProject
+ {F7E6A782-1C15-46E3-B645-922494B9F146} = {F7E6A782-1C15-46E3-B645-922494B9F146}
+ {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC} = {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pcretest", ".\pcretest.vcproj", "{6C80CEA6-BD35-4258-99E9-BBA6C7E7B745}"
+ ProjectSection(ProjectDependencies) = postProject
+ {BF19C1B7-362C-4F10-9DA1-F142D1DA633E} = {BF19C1B7-362C-4F10-9DA1-F142D1DA633E}
+ {F7E6A782-1C15-46E3-B645-922494B9F146} = {F7E6A782-1C15-46E3-B645-922494B9F146}
+ {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC} = {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC}
+ EndProjectSection
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Win32 = Debug|Win32
+ Release|Win32 = Release|Win32
+ MinSizeRel|Win32 = MinSizeRel|Win32
+ RelWithDebInfo|Win32 = RelWithDebInfo|Win32
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {8EA48733-5246-4479-AC13-94A899A510BF}.Debug|Win32.ActiveCfg = Debug|Win32
+ {8EA48733-5246-4479-AC13-94A899A510BF}.Debug|Win32.Build.0 = Debug|Win32
+ {8EA48733-5246-4479-AC13-94A899A510BF}.Release|Win32.ActiveCfg = Release|Win32
+ {8EA48733-5246-4479-AC13-94A899A510BF}.Release|Win32.Build.0 = Release|Win32
+ {8EA48733-5246-4479-AC13-94A899A510BF}.MinSizeRel|Win32.ActiveCfg = MinSizeRel|Win32
+ {8EA48733-5246-4479-AC13-94A899A510BF}.MinSizeRel|Win32.Build.0 = MinSizeRel|Win32
+ {8EA48733-5246-4479-AC13-94A899A510BF}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|Win32
+ {8EA48733-5246-4479-AC13-94A899A510BF}.RelWithDebInfo|Win32.Build.0 = RelWithDebInfo|Win32
+ {C3E33D1A-F3FA-4F04-B14D-D5F413C20F34}.Debug|Win32.ActiveCfg = Debug|Win32
+ {C3E33D1A-F3FA-4F04-B14D-D5F413C20F34}.Release|Win32.ActiveCfg = Release|Win32
+ {C3E33D1A-F3FA-4F04-B14D-D5F413C20F34}.MinSizeRel|Win32.ActiveCfg = MinSizeRel|Win32
+ {C3E33D1A-F3FA-4F04-B14D-D5F413C20F34}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|Win32
+ {F734992B-C147-4FF3-89DA-4A6D747CD9F3}.Debug|Win32.ActiveCfg = Debug|Win32
+ {F734992B-C147-4FF3-89DA-4A6D747CD9F3}.Release|Win32.ActiveCfg = Release|Win32
+ {F734992B-C147-4FF3-89DA-4A6D747CD9F3}.MinSizeRel|Win32.ActiveCfg = MinSizeRel|Win32
+ {F734992B-C147-4FF3-89DA-4A6D747CD9F3}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|Win32
+ {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC}.Debug|Win32.ActiveCfg = Debug|Win32
+ {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC}.Debug|Win32.Build.0 = Debug|Win32
+ {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC}.Release|Win32.ActiveCfg = Release|Win32
+ {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC}.Release|Win32.Build.0 = Release|Win32
+ {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC}.MinSizeRel|Win32.ActiveCfg = MinSizeRel|Win32
+ {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC}.MinSizeRel|Win32.Build.0 = MinSizeRel|Win32
+ {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|Win32
+ {3C0CFC5A-1FAC-48B6-9564-AEC91CAB2FEC}.RelWithDebInfo|Win32.Build.0 = RelWithDebInfo|Win32
+ {F7E6A782-1C15-46E3-B645-922494B9F146}.Debug|Win32.ActiveCfg = Debug|Win32
+ {F7E6A782-1C15-46E3-B645-922494B9F146}.Debug|Win32.Build.0 = Debug|Win32
+ {F7E6A782-1C15-46E3-B645-922494B9F146}.Release|Win32.ActiveCfg = Release|Win32
+ {F7E6A782-1C15-46E3-B645-922494B9F146}.Release|Win32.Build.0 = Release|Win32
+ {F7E6A782-1C15-46E3-B645-922494B9F146}.MinSizeRel|Win32.ActiveCfg = MinSizeRel|Win32
+ {F7E6A782-1C15-46E3-B645-922494B9F146}.MinSizeRel|Win32.Build.0 = MinSizeRel|Win32
+ {F7E6A782-1C15-46E3-B645-922494B9F146}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|Win32
+ {F7E6A782-1C15-46E3-B645-922494B9F146}.RelWithDebInfo|Win32.Build.0 = RelWithDebInfo|Win32
+ {164D50FF-783C-486F-9B07-D3D68DC96D99}.Debug|Win32.ActiveCfg = Debug|Win32
+ {164D50FF-783C-486F-9B07-D3D68DC96D99}.Debug|Win32.Build.0 = Debug|Win32
+ {164D50FF-783C-486F-9B07-D3D68DC96D99}.Release|Win32.ActiveCfg = Release|Win32
+ {164D50FF-783C-486F-9B07-D3D68DC96D99}.Release|Win32.Build.0 = Release|Win32
+ {164D50FF-783C-486F-9B07-D3D68DC96D99}.MinSizeRel|Win32.ActiveCfg = MinSizeRel|Win32
+ {164D50FF-783C-486F-9B07-D3D68DC96D99}.MinSizeRel|Win32.Build.0 = MinSizeRel|Win32
+ {164D50FF-783C-486F-9B07-D3D68DC96D99}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|Win32
+ {164D50FF-783C-486F-9B07-D3D68DC96D99}.RelWithDebInfo|Win32.Build.0 = RelWithDebInfo|Win32
+ {C4C8D796-13C0-40C0-9A8F-75BA1AB5DEEE}.Debug|Win32.ActiveCfg = Debug|Win32
+ {C4C8D796-13C0-40C0-9A8F-75BA1AB5DEEE}.Debug|Win32.Build.0 = Debug|Win32
+ {C4C8D796-13C0-40C0-9A8F-75BA1AB5DEEE}.Release|Win32.ActiveCfg = Release|Win32
+ {C4C8D796-13C0-40C0-9A8F-75BA1AB5DEEE}.Release|Win32.Build.0 = Release|Win32
+ {C4C8D796-13C0-40C0-9A8F-75BA1AB5DEEE}.MinSizeRel|Win32.ActiveCfg = MinSizeRel|Win32
+ {C4C8D796-13C0-40C0-9A8F-75BA1AB5DEEE}.MinSizeRel|Win32.Build.0 = MinSizeRel|Win32
+ {C4C8D796-13C0-40C0-9A8F-75BA1AB5DEEE}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|Win32
+ {C4C8D796-13C0-40C0-9A8F-75BA1AB5DEEE}.RelWithDebInfo|Win32.Build.0 = RelWithDebInfo|Win32
+ {1D12D1F3-C077-4443-8F26-024D63AFD5B6}.Debug|Win32.ActiveCfg = Debug|Win32
+ {1D12D1F3-C077-4443-8F26-024D63AFD5B6}.Debug|Win32.Build.0 = Debug|Win32
+ {1D12D1F3-C077-4443-8F26-024D63AFD5B6}.Release|Win32.ActiveCfg = Release|Win32
+ {1D12D1F3-C077-4443-8F26-024D63AFD5B6}.Release|Win32.Build.0 = Release|Win32
+ {1D12D1F3-C077-4443-8F26-024D63AFD5B6}.MinSizeRel|Win32.ActiveCfg = MinSizeRel|Win32
+ {1D12D1F3-C077-4443-8F26-024D63AFD5B6}.MinSizeRel|Win32.Build.0 = MinSizeRel|Win32
+ {1D12D1F3-C077-4443-8F26-024D63AFD5B6}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|Win32
+ {1D12D1F3-C077-4443-8F26-024D63AFD5B6}.RelWithDebInfo|Win32.Build.0 = RelWithDebInfo|Win32
+ {866FCC80-8127-40FF-9F2A-FDEBDD4871A3}.Debug|Win32.ActiveCfg = Debug|Win32
+ {866FCC80-8127-40FF-9F2A-FDEBDD4871A3}.Debug|Win32.Build.0 = Debug|Win32
+ {866FCC80-8127-40FF-9F2A-FDEBDD4871A3}.Release|Win32.ActiveCfg = Release|Win32
+ {866FCC80-8127-40FF-9F2A-FDEBDD4871A3}.Release|Win32.Build.0 = Release|Win32
+ {866FCC80-8127-40FF-9F2A-FDEBDD4871A3}.MinSizeRel|Win32.ActiveCfg = MinSizeRel|Win32
+ {866FCC80-8127-40FF-9F2A-FDEBDD4871A3}.MinSizeRel|Win32.Build.0 = MinSizeRel|Win32
+ {866FCC80-8127-40FF-9F2A-FDEBDD4871A3}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|Win32
+ {866FCC80-8127-40FF-9F2A-FDEBDD4871A3}.RelWithDebInfo|Win32.Build.0 = RelWithDebInfo|Win32
+ {C755EFD1-85CA-4BBA-A7D3-5E8C06673C61}.Debug|Win32.ActiveCfg = Debug|Win32
+ {C755EFD1-85CA-4BBA-A7D3-5E8C06673C61}.Debug|Win32.Build.0 = Debug|Win32
+ {C755EFD1-85CA-4BBA-A7D3-5E8C06673C61}.Release|Win32.ActiveCfg = Release|Win32
+ {C755EFD1-85CA-4BBA-A7D3-5E8C06673C61}.Release|Win32.Build.0 = Release|Win32
+ {C755EFD1-85CA-4BBA-A7D3-5E8C06673C61}.MinSizeRel|Win32.ActiveCfg = MinSizeRel|Win32
+ {C755EFD1-85CA-4BBA-A7D3-5E8C06673C61}.MinSizeRel|Win32.Build.0 = MinSizeRel|Win32
+ {C755EFD1-85CA-4BBA-A7D3-5E8C06673C61}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|Win32
+ {C755EFD1-85CA-4BBA-A7D3-5E8C06673C61}.RelWithDebInfo|Win32.Build.0 = RelWithDebInfo|Win32
+ {BF19C1B7-362C-4F10-9DA1-F142D1DA633E}.Debug|Win32.ActiveCfg = Debug|Win32
+ {BF19C1B7-362C-4F10-9DA1-F142D1DA633E}.Debug|Win32.Build.0 = Debug|Win32
+ {BF19C1B7-362C-4F10-9DA1-F142D1DA633E}.Release|Win32.ActiveCfg = Release|Win32
+ {BF19C1B7-362C-4F10-9DA1-F142D1DA633E}.Release|Win32.Build.0 = Release|Win32
+ {BF19C1B7-362C-4F10-9DA1-F142D1DA633E}.MinSizeRel|Win32.ActiveCfg = MinSizeRel|Win32
+ {BF19C1B7-362C-4F10-9DA1-F142D1DA633E}.MinSizeRel|Win32.Build.0 = MinSizeRel|Win32
+ {BF19C1B7-362C-4F10-9DA1-F142D1DA633E}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|Win32
+ {BF19C1B7-362C-4F10-9DA1-F142D1DA633E}.RelWithDebInfo|Win32.Build.0 = RelWithDebInfo|Win32
+ {6C80CEA6-BD35-4258-99E9-BBA6C7E7B745}.Debug|Win32.ActiveCfg = Debug|Win32
+ {6C80CEA6-BD35-4258-99E9-BBA6C7E7B745}.Debug|Win32.Build.0 = Debug|Win32
+ {6C80CEA6-BD35-4258-99E9-BBA6C7E7B745}.Release|Win32.ActiveCfg = Release|Win32
+ {6C80CEA6-BD35-4258-99E9-BBA6C7E7B745}.Release|Win32.Build.0 = Release|Win32
+ {6C80CEA6-BD35-4258-99E9-BBA6C7E7B745}.MinSizeRel|Win32.ActiveCfg = MinSizeRel|Win32
+ {6C80CEA6-BD35-4258-99E9-BBA6C7E7B745}.MinSizeRel|Win32.Build.0 = MinSizeRel|Win32
+ {6C80CEA6-BD35-4258-99E9-BBA6C7E7B745}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|Win32
+ {6C80CEA6-BD35-4258-99E9-BBA6C7E7B745}.RelWithDebInfo|Win32.Build.0 = RelWithDebInfo|Win32
+ EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ EndGlobalSection
+ GlobalSection(ExtensibilityAddIns) = postSolution
+ EndGlobalSection
+EndGlobal
Modified: trunk/Externals/pcre/Win32/pcre.vcproj
===================================================================
--- trunk/Externals/pcre/Win32/pcre.vcproj 2009-12-29 18:39:32 UTC (rev 7069)
+++ trunk/Externals/pcre/Win32/pcre.vcproj 2009-12-29 19:26:44 UTC (rev 7070)
@@ -60,7 +60,7 @@
RuntimeLibrary="3"
AssemblerListingLocation="Debug"
ObjectFile="$(IntDir)\"
- ProgramDataBaseFileName="./Debug/pcred.pdb"
+ ProgramDataBaseFileName="./Debug/pcre.pdb"
WarningLevel="3"
DebugInformationFormat="3"
CompileAs="1"
@@ -81,13 +81,13 @@
LinkLibraryDependencies="false"
AdditionalOptions=" /STACK:10000000 /machine:I386 /debug"
AdditionalDependencies="$(NOINHERIT) kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib "
- OutputFile=".\Debug\pcred.dll"
+ OutputFile=".\Debug\pcre.dll"
Version="0.0"
LinkIncremental="2"
AdditionalLibraryDirectories=""
GenerateDebugInformation="true"
- ProgramDatabaseFile=".\Debug\pcred.pdb"
- ImportLibrary=".\Debug\pcred.lib"
+ ProgramDatabaseFile=".\Debug\pcre.pdb"
+ ImportLibrary=".\Debug\pcre.lib"
/>
<Tool
Name="VCALinkTool"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-12-29 18:39:40
|
Revision: 7069
http://winmerge.svn.sourceforge.net/winmerge/?rev=7069&view=rev
Author: kimmov
Date: 2009-12-29 18:39:32 +0000 (Tue, 29 Dec 2009)
Log Message:
-----------
Fix PCRE project file.
Use relative paths instead of absolute paths. Remove custom rule.
Modified Paths:
--------------
trunk/Externals/pcre/Win32/pcre.vcproj
Modified: trunk/Externals/pcre/Win32/pcre.vcproj
===================================================================
--- trunk/Externals/pcre/Win32/pcre.vcproj 2009-12-29 18:22:40 UTC (rev 7068)
+++ trunk/Externals/pcre/Win32/pcre.vcproj 2009-12-29 18:39:32 UTC (rev 7069)
@@ -1,14 +1,18 @@
-<?xml version="1.0" encoding = "Windows-1252"?>
+<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="8.00"
Name="pcre"
ProjectGUID="{F7E6A782-1C15-46E3-B645-922494B9F146}"
- Keyword="Win32Proj">
+ Keyword="Win32Proj"
+ >
<Platforms>
<Platform
- Name="Win32"/>
+ Name="Win32"
+ />
</Platforms>
+ <ToolFiles>
+ </ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
@@ -16,61 +20,99 @@
IntermediateDirectory="pcre.dir\Debug"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
<Tool
- Name="VCCLCompilerTool"
- AdditionalOptions=" /Zm1000"
- AdditionalIncludeDirectories="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win32;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre;"
- BasicRuntimeChecks="3"
- CompileAs="1"
- DebugInformationFormat="3"
- ExceptionHandling="0"
- InlineFunctionExpansion="0"
- Optimization="0"
- RuntimeLibrary="3"
- WarningLevel="3"
- PreprocessorDefinitions="WIN32,_WINDOWS,_DEBUG,HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"Debug\",pcre_EXPORTS"
- AssemblerListingLocation="Debug"
- ObjectFile="$(IntDir)\"
- ProgramDataBaseFileName="D:/Work/WinMerge/WinMerge_SVN/Externals/pcre/Win32/Debug/pcred.pdb"
-/>
+ Name="VCPreBuildEventTool"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCCustomBuildTool"
+ />
<Tool
- Name="VCResourceCompilerTool"
- AdditionalIncludeDirectories="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win32;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre;"
- PreprocessorDefinitions="WIN32,_WINDOWS,_DEBUG,HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"Debug\",pcre_EXPORTS"/>
+ Name="VCXMLDataGeneratorTool"
+ />
<Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
Name="VCMIDLTool"
PreprocessorDefinitions="WIN32,_WINDOWS,_DEBUG,HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"Debug\",pcre_EXPORTS"
- MkTypLibCompatible="FALSE"
+ MkTypLibCompatible="false"
TargetEnvironment="1"
- GenerateStublessProxies="TRUE"
+ GenerateStublessProxies="true"
TypeLibraryName="$(InputName).tlb"
OutputDirectory="$(IntDir)"
HeaderFileName="$(InputName).h"
DLLDataFileName=""
InterfaceIdentifierFileName="$(InputName)_i.c"
- ProxyFileName="$(InputName)_p.c"/>
+ ProxyFileName="$(InputName)_p.c"
+ />
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCCLCompilerTool"
+ AdditionalOptions=" /Zm1000"
+ Optimization="0"
+ InlineFunctionExpansion="0"
+ AdditionalIncludeDirectories=".;..;"
+ PreprocessorDefinitions="WIN32,_WINDOWS,_DEBUG,HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"Debug\",pcre_EXPORTS"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ AssemblerListingLocation="Debug"
+ ObjectFile="$(IntDir)\"
+ ProgramDataBaseFileName="./Debug/pcred.pdb"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ CompileAs="1"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="WIN32,_WINDOWS,_DEBUG,HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"Debug\",pcre_EXPORTS"
+ AdditionalIncludeDirectories=".;..;"
+ />
<Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
Name="VCLinkerTool"
LinkLibraryDependencies="false"
AdditionalOptions=" /STACK:10000000 /machine:I386 /debug"
AdditionalDependencies="$(NOINHERIT) kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib "
- OutputFile="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win32\Debug\pcred.dll"
+ OutputFile=".\Debug\pcred.dll"
Version="0.0"
LinkIncremental="2"
AdditionalLibraryDirectories=""
- ProgramDataBaseFile="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win32\Debug\pcred.pdb"
- GenerateDebugInformation="TRUE"
- ImportLibrary="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win32\Debug\pcred.lib"/>
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile=".\Debug\pcred.pdb"
+ ImportLibrary=".\Debug\pcred.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
<Configuration
Name="Release|Win32"
@@ -78,58 +120,96 @@
IntermediateDirectory="pcre.dir\Release"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
<Tool
- Name="VCCLCompilerTool"
- AdditionalOptions=" /Zm1000"
- AdditionalIncludeDirectories="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win32;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre;"
- CompileAs="1"
- ExceptionHandling="0"
- InlineFunctionExpansion="2"
- Optimization="2"
- RuntimeLibrary="2"
- WarningLevel="3"
- PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"Release\",pcre_EXPORTS"
- AssemblerListingLocation="Release"
- ObjectFile="$(IntDir)\"
- ProgramDataBaseFileName="D:/Work/WinMerge/WinMerge_SVN/Externals/pcre/Win32/Release/pcre.pdb"
-/>
+ Name="VCPreBuildEventTool"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCCustomBuildTool"
+ />
<Tool
- Name="VCResourceCompilerTool"
- AdditionalIncludeDirectories="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win32;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre;"
- PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"Release\",pcre_EXPORTS"/>
+ Name="VCXMLDataGeneratorTool"
+ />
<Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
Name="VCMIDLTool"
PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"Release\",pcre_EXPORTS"
- MkTypLibCompatible="FALSE"
+ MkTypLibCompatible="false"
TargetEnvironment="1"
- GenerateStublessProxies="TRUE"
+ GenerateStublessProxies="true"
TypeLibraryName="$(InputName).tlb"
OutputDirectory="$(IntDir)"
HeaderFileName="$(InputName).h"
DLLDataFileName=""
InterfaceIdentifierFileName="$(InputName)_i.c"
- ProxyFileName="$(InputName)_p.c"/>
+ ProxyFileName="$(InputName)_p.c"
+ />
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCCLCompilerTool"
+ AdditionalOptions=" /Zm1000"
+ Optimization="2"
+ InlineFunctionExpansion="2"
+ AdditionalIncludeDirectories=".;..;"
+ PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"Release\",pcre_EXPORTS"
+ ExceptionHandling="0"
+ RuntimeLibrary="2"
+ AssemblerListingLocation="Release"
+ ObjectFile="$(IntDir)\"
+ ProgramDataBaseFileName="./Release/pcre.pdb"
+ WarningLevel="3"
+ CompileAs="1"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"Release\",pcre_EXPORTS"
+ AdditionalIncludeDirectories=".;..;"
+ />
<Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
Name="VCLinkerTool"
LinkLibraryDependencies="false"
AdditionalOptions=" /STACK:10000000 /machine:I386"
AdditionalDependencies="$(NOINHERIT) kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib "
- OutputFile="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win32\Release\pcre.dll"
+ OutputFile=".\Release\pcre.dll"
Version="0.0"
LinkIncremental="1"
AdditionalLibraryDirectories=""
- ProgramDataBaseFile="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win32\Release\pcre.pdb"
- ImportLibrary="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win32\Release\pcre.lib"/>
+ ProgramDatabaseFile=".\Release\pcre.pdb"
+ ImportLibrary=".\Release\pcre.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
<Configuration
Name="MinSizeRel|Win32"
@@ -137,58 +217,96 @@
IntermediateDirectory="pcre.dir\MinSizeRel"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
<Tool
- Name="VCCLCompilerTool"
- AdditionalOptions=" /Zm1000"
- AdditionalIncludeDirectories="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win32;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre;"
- CompileAs="1"
- ExceptionHandling="0"
- InlineFunctionExpansion="1"
- Optimization="1"
- RuntimeLibrary="2"
- WarningLevel="3"
- PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"MinSizeRel\",pcre_EXPORTS"
- AssemblerListingLocation="MinSizeRel"
- ObjectFile="$(IntDir)\"
- ProgramDataBaseFileName="D:/Work/WinMerge/WinMerge_SVN/Externals/pcre/Win32/MinSizeRel/pcre.pdb"
-/>
+ Name="VCPreBuildEventTool"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCCustomBuildTool"
+ />
<Tool
- Name="VCResourceCompilerTool"
- AdditionalIncludeDirectories="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win32;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre;"
- PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"MinSizeRel\",pcre_EXPORTS"/>
+ Name="VCXMLDataGeneratorTool"
+ />
<Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
Name="VCMIDLTool"
PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"MinSizeRel\",pcre_EXPORTS"
- MkTypLibCompatible="FALSE"
+ MkTypLibCompatible="false"
TargetEnvironment="1"
- GenerateStublessProxies="TRUE"
+ GenerateStublessProxies="true"
TypeLibraryName="$(InputName).tlb"
OutputDirectory="$(IntDir)"
HeaderFileName="$(InputName).h"
DLLDataFileName=""
InterfaceIdentifierFileName="$(InputName)_i.c"
- ProxyFileName="$(InputName)_p.c"/>
+ ProxyFileName="$(InputName)_p.c"
+ />
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCCLCompilerTool"
+ AdditionalOptions=" /Zm1000"
+ Optimization="1"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories=".;..;"
+ PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"MinSizeRel\",pcre_EXPORTS"
+ ExceptionHandling="0"
+ RuntimeLibrary="2"
+ AssemblerListingLocation="MinSizeRel"
+ ObjectFile="$(IntDir)\"
+ ProgramDataBaseFileName="./MinSizeRel/pcre.pdb"
+ WarningLevel="3"
+ CompileAs="1"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"MinSizeRel\",pcre_EXPORTS"
+ AdditionalIncludeDirectories=".;..;"
+ />
<Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
Name="VCLinkerTool"
LinkLibraryDependencies="false"
AdditionalOptions=" /STACK:10000000 /machine:I386"
AdditionalDependencies="$(NOINHERIT) kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib "
- OutputFile="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win32\MinSizeRel\pcre.dll"
+ OutputFile=".\MinSizeRel\pcre.dll"
Version="0.0"
LinkIncremental="1"
AdditionalLibraryDirectories=""
- ProgramDataBaseFile="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win32\MinSizeRel\pcre.pdb"
- ImportLibrary="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win32\MinSizeRel\pcre.lib"/>
+ ProgramDatabaseFile=".\MinSizeRel\pcre.pdb"
+ ImportLibrary=".\MinSizeRel\pcre.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
<Configuration
Name="RelWithDebInfo|Win32"
@@ -196,176 +314,247 @@
IntermediateDirectory="pcre.dir\RelWithDebInfo"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
<Tool
- Name="VCCLCompilerTool"
- AdditionalOptions=" /Zm1000"
- AdditionalIncludeDirectories="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win32;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre;"
- CompileAs="1"
- DebugInformationFormat="3"
- ExceptionHandling="0"
- InlineFunctionExpansion="1"
- Optimization="2"
- RuntimeLibrary="2"
- WarningLevel="3"
- PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"RelWithDebInfo\",pcre_EXPORTS"
- AssemblerListingLocation="RelWithDebInfo"
- ObjectFile="$(IntDir)\"
- ProgramDataBaseFileName="D:/Work/WinMerge/WinMerge_SVN/Externals/pcre/Win32/RelWithDebInfo/pcre.pdb"
-/>
+ Name="VCPreBuildEventTool"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCCustomBuildTool"
+ />
<Tool
- Name="VCResourceCompilerTool"
- AdditionalIncludeDirectories="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win32;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre;"
- PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"RelWithDebInfo\",pcre_EXPORTS"/>
+ Name="VCXMLDataGeneratorTool"
+ />
<Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
Name="VCMIDLTool"
PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"RelWithDebInfo\",pcre_EXPORTS"
- MkTypLibCompatible="FALSE"
+ MkTypLibCompatible="false"
TargetEnvironment="1"
- GenerateStublessProxies="TRUE"
+ GenerateStublessProxies="true"
TypeLibraryName="$(InputName).tlb"
OutputDirectory="$(IntDir)"
HeaderFileName="$(InputName).h"
DLLDataFileName=""
InterfaceIdentifierFileName="$(InputName)_i.c"
- ProxyFileName="$(InputName)_p.c"/>
+ ProxyFileName="$(InputName)_p.c"
+ />
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCCLCompilerTool"
+ AdditionalOptions=" /Zm1000"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories=".;..;"
+ PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"RelWithDebInfo\",pcre_EXPORTS"
+ ExceptionHandling="0"
+ RuntimeLibrary="2"
+ AssemblerListingLocation="RelWithDebInfo"
+ ObjectFile="$(IntDir)\"
+ ProgramDataBaseFileName="./RelWithDebInfo/pcre.pdb"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ CompileAs="1"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"RelWithDebInfo\",pcre_EXPORTS"
+ AdditionalIncludeDirectories=".;..;"
+ />
<Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
Name="VCLinkerTool"
LinkLibraryDependencies="false"
AdditionalOptions=" /STACK:10000000 /machine:I386 /debug"
AdditionalDependencies="$(NOINHERIT) kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib "
- OutputFile="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win32\RelWithDebInfo\pcre.dll"
+ OutputFile=".\RelWithDebInfo\pcre.dll"
Version="0.0"
LinkIncremental="2"
AdditionalLibraryDirectories=""
- ProgramDataBaseFile="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win32\RelWithDebInfo\pcre.pdb"
- GenerateDebugInformation="TRUE"
- ImportLibrary="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win32\RelWithDebInfo\pcre.lib"/>
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile=".\RelWithDebInfo\pcre.pdb"
+ ImportLibrary=".\RelWithDebInfo\pcre.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
</Configurations>
+ <References>
+ </References>
<Files>
- <File
- RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\CMakeLists.txt">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCustomBuildTool"
- Description="Building Custom Rule D:/Work/WinMerge/WinMerge_SVN/Externals/pcre/CMakeLists.txt"
- CommandLine=""C:\Program Files\CMake 2.8\bin\cmake.exe" -HD:/Work/WinMerge/WinMerge_SVN/Externals/pcre -BD:/Work/WinMerge/WinMerge_SVN/Externals/pcre/Win32 --check-stamp-file CMakeFiles/generate.stamp"
- AdditionalDependencies="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\CMakeLists.txt;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win32\CMakeFiles\CMakeSystem.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win32\CMakeFiles\CMakeCCompiler.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win32\CMakeFiles\CMakeCXXCompiler.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeSystemSpecificInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeGenericSystem.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\gcc.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\Windows.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\WindowsPaths.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\Windows-cl.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win32\CMakeFiles\CMakeCPlatform.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win32\CMakeFiles\CMakeCXXPlatform.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\cl.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win32\CMakeFiles\CMakeRCCompiler.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeRCInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCommonLanguageInclude.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCXXInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCommonLanguageInclude.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\FindBZip2.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\cmake\FindPackageHandleStandardArgs.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\FindZLIB.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\cmake\FindPackageHandleStandardArgs.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\cmake\FindReadline.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\cmake\FindPackageHandleStandardArgs.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckIncludeFile.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckIncludeFileCXX.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckFunctionExists.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckTypeSize.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckIncludeFile.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\config-cmake.h.in;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre.h.generic;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_stringpiece.h.in;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcrecpparg.h.in;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_chartables.c.dist;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\CMakeLists.txt;"
- Outputs="CMakeFiles\generate.stamp"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCustomBuildTool"
- Description="Building Custom Rule D:/Work/WinMerge/WinMerge_SVN/Externals/pcre/CMakeLists.txt"
- CommandLine=""C:\Program Files\CMake 2.8\bin\cmake.exe" -HD:/Work/WinMerge/WinMerge_SVN/Externals/pcre -BD:/Work/WinMerge/WinMerge_SVN/Externals/pcre/Win32 --check-stamp-file CMakeFiles/generate.stamp"
- AdditionalDependencies="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\CMakeLists.txt;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win32\CMakeFiles\CMakeSystem.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win32\CMakeFiles\CMakeCCompiler.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win32\CMakeFiles\CMakeCXXCompiler.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeSystemSpecificInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeGenericSystem.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\gcc.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\Windows.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\WindowsPaths.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\Windows-cl.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win32\CMakeFiles\CMakeCPlatform.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win32\CMakeFiles\CMakeCXXPlatform.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\cl.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win32\CMakeFiles\CMakeRCCompiler.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeRCInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCommonLanguageInclude.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCXXInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCommonLanguageInclude.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\FindBZip2.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\cmake\FindPackageHandleStandardArgs.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\FindZLIB.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\cmake\FindPackageHandleStandardArgs.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\cmake\FindReadline.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\cmake\FindPackageHandleStandardArgs.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckIncludeFile.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckIncludeFileCXX.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckFunctionExists.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckTypeSize.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckIncludeFile.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\config-cmake.h.in;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre.h.generic;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_stringpiece.h.in;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcrecpparg.h.in;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_chartables.c.dist;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\CMakeLists.txt;"
- Outputs="CMakeFiles\generate.stamp"/>
- </FileConfiguration>
- <FileConfiguration
- Name="MinSizeRel|Win32">
- <Tool
- Name="VCCustomBuildTool"
- Description="Building Custom Rule D:/Work/WinMerge/WinMerge_SVN/Externals/pcre/CMakeLists.txt"
- CommandLine=""C:\Program Files\CMake 2.8\bin\cmake.exe" -HD:/Work/WinMerge/WinMerge_SVN/Externals/pcre -BD:/Work/WinMerge/WinMerge_SVN/Externals/pcre/Win32 --check-stamp-file CMakeFiles/generate.stamp"
- AdditionalDependencies="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\CMakeLists.txt;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win32\CMakeFiles\CMakeSystem.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win32\CMakeFiles\CMakeCCompiler.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win32\CMakeFiles\CMakeCXXCompiler.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeSystemSpecificInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeGenericSystem.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\gcc.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\Windows.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\WindowsPaths.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\Windows-cl.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win32\CMakeFiles\CMakeCPlatform.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win32\CMakeFiles\CMakeCXXPlatform.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\cl.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win32\CMakeFiles\CMakeRCCompiler.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeRCInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCommonLanguageInclude.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCXXInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCommonLanguageInclude.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\FindBZip2.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\cmake\FindPackageHandleStandardArgs.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\FindZLIB.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\cmake\FindPackageHandleStandardArgs.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\cmake\FindReadline.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\cmake\FindPackageHandleStandardArgs.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckIncludeFile.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckIncludeFileCXX.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckFunctionExists.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckTypeSize.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckIncludeFile.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\config-cmake.h.in;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre.h.generic;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_stringpiece.h.in;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcrecpparg.h.in;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_chartables.c.dist;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\CMakeLists.txt;"
- Outputs="CMakeFiles\generate.stamp"/>
- </FileConfiguration>
- <FileConfiguration
- Name="RelWithDebInfo|Win32">
- <Tool
- Name="VCCustomBuildTool"
- Description="Building Custom Rule D:/Work/WinMerge/WinMerge_SVN/Externals/pcre/CMakeLists.txt"
- CommandLine=""C:\Program Files\CMake 2.8\bin\cmake.exe" -HD:/Work/WinMerge/WinMerge_SVN/Externals/pcre -BD:/Work/WinMerge/WinMerge_SVN/Externals/pcre/Win32 --check-stamp-file CMakeFiles/generate.stamp"
- AdditionalDependencies="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\CMakeLists.txt;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win32\CMakeFiles\CMakeSystem.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win32\CMakeFiles\CMakeCCompiler.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win32\CMakeFiles\CMakeCXXCompiler.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeSystemSpecificInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeGenericSystem.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\gcc.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\Windows.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\WindowsPaths.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\Windows-cl.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win32\CMakeFiles\CMakeCPlatform.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win32\CMakeFiles\CMakeCXXPlatform.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\cl.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win32\CMakeFiles\CMakeRCCompiler.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeRCInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCommonLanguageInclude.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCXXInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCommonLanguageInclude.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\FindBZip2.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\cmake\FindPackageHandleStandardArgs.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\FindZLIB.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\cmake\FindPackageHandleStandardArgs.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\cmake\FindReadline.cmake;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\cmake\FindPackageHandleStandardArgs.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckIncludeFile.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckIncludeFileCXX.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckFunctionExists.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckTypeSize.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckIncludeFile.cmake";D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\config-cmake.h.in;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre.h.generic;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_stringpiece.h.in;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcrecpparg.h.in;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_chartables.c.dist;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\CMakeLists.txt;"
- Outputs="CMakeFiles\generate.stamp"/>
- </FileConfiguration>
- </File>
<Filter
Name="Source Files"
- Filter="">
+ >
<File
- RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win32\pcre_chartables.c">
+ RelativePath=".\pcre_chartables.c"
+ >
</File>
<File
- RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_compile.c">
+ RelativePath="..\pcre_compile.c"
+ >
</File>
<File
- RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_config.c">
+ RelativePath="..\pcre_config.c"
+ >
</File>
<File
- RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_dfa_exec.c">
+ RelativePath="..\pcre_dfa_exec.c"
+ >
</File>
<File
- RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_exec.c">
+ RelativePath="..\pcre_exec.c"
+ >
</File>
<File
- RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_fullinfo.c">
+ RelativePath="..\pcre_fullinfo.c"
+ >
</File>
<File
- RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_get.c">
+ RelativePath="..\pcre_get.c"
+ >
</File>
<File
- RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_globals.c">
+ RelativePath="..\pcre_globals.c"
+ >
</File>
<File
- RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_info.c">
+ RelativePath="..\pcre_info.c"
+ >
</File>
<File
- RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_newline.c">
+ RelativePath="..\pcre_maketables.c"
+ >
</File>
<File
- RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_maketables.c">
+ RelativePath="..\pcre_newline.c"
+ >
</File>
<File
- RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_ord2utf8.c">
+ RelativePath="..\pcre_ord2utf8.c"
+ >
</File>
<File
- RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_refcount.c">
+ RelativePath="..\pcre_refcount.c"
+ >
</File>
<File
- RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_study.c">
+ RelativePath="..\pcre_study.c"
+ >
</File>
<File
- RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_tables.c">
+ RelativePath="..\pcre_tables.c"
+ >
</File>
<File
- RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_try_flipped.c">
+ RelativePath="..\pcre_try_flipped.c"
+ >
</File>
<File
- RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_ucd.c">
+ RelativePath="..\pcre_ucd.c"
+ >
</File>
<File
- RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_valid_utf8.c">
+ RelativePath="..\pcre_valid_utf8.c"
+ >
</File>
<File
- RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_version.c">
+ RelativePath="..\pcre_version.c"
+ >
</File>
<File
- RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\pcre_xclass.c">
+ RelativePath="..\pcre_xclass.c"
+ >
</File>
</Filter>
<Filter
Name="Header Files"
- Filter="">
+ >
<File
- RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win32\pcre.h">
+ RelativePath=".\config.h"
+ >
</File>
<File
- RelativePath="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win32\config.h">
+ RelativePath=".\pcre.h"
+ >
</File>
</Filter>
+ <File
+ RelativePath="..\CMakeLists.txt"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Building Custom Rule D:/Work/WinMerge/WinMerge_SVN/Externals/pcre/CMakeLists.txt"
+ CommandLine=""C:\Program Files\CMake 2.8\bin\cmake.exe" -HD:/Work/WinMerge/WinMerge_SVN/Externals/pcre -B. --check-stamp-file CMakeFiles/generate.stamp
"
+ AdditionalDependencies="..\CMakeLists.txt;.\CMakeFiles\CMakeSystem.cmake;.\CMakeFiles\CMakeCCompiler.cmake;.\CMakeFiles\CMakeCXXCompiler.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeSystemSpecificInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeGenericSystem.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\gcc.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\Windows.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\WindowsPaths.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\Windows-cl.cmake";.\CMakeFiles\CMakeCPlatform.cmake;.\CMakeFiles\CMakeCXXPlatform.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\cl.cmake";.\CMakeFiles\CMakeRCCompiler.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeRCInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCommonLanguageInclude.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCXXInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCommonLanguageInclude.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\FindBZip2.cmake";..\cmake\FindPackageHandleStandardArgs.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\FindZLIB.cmake";..\cmake\FindPackageHandleStandardArgs.cmake;..\cmake\FindReadline.cmake;..\cmake\FindPackageHandleStandardArgs.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckIncludeFile.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckIncludeFileCXX.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckFunctionExists.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckTypeSize.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckIncludeFile.cmake";..\config-cmake.h.in;..\pcre.h.generic;..\pcre_stringpiece.h.in;..\pcrecpparg.h.in;..\pcre_chartables.c.dist;..\CMakeLists.txt;"
+ Outputs="CMakeFiles\generate.stamp"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Building Custom Rule D:/Work/WinMerge/WinMerge_SVN/Externals/pcre/CMakeLists.txt"
+ CommandLine=""C:\Program Files\CMake 2.8\bin\cmake.exe" -HD:/Work/WinMerge/WinMerge_SVN/Externals/pcre -B. --check-stamp-file CMakeFiles/generate.stamp
"
+ AdditionalDependencies="..\CMakeLists.txt;.\CMakeFiles\CMakeSystem.cmake;.\CMakeFiles\CMakeCCompiler.cmake;.\CMakeFiles\CMakeCXXCompiler.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeSystemSpecificInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeGenericSystem.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\gcc.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\Windows.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\WindowsPaths.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\Windows-cl.cmake";.\CMakeFiles\CMakeCPlatform.cmake;.\CMakeFiles\CMakeCXXPlatform.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\cl.cmake";.\CMakeFiles\CMakeRCCompiler.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeRCInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCommonLanguageInclude.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCXXInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCommonLanguageInclude.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\FindBZip2.cmake";..\cmake\FindPackageHandleStandardArgs.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\FindZLIB.cmake";..\cmake\FindPackageHandleStandardArgs.cmake;..\cmake\FindReadline.cmake;..\cmake\FindPackageHandleStandardArgs.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckIncludeFile.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckIncludeFileCXX.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckFunctionExists.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckTypeSize.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckIncludeFile.cmake";..\config-cmake.h.in;..\pcre.h.generic;..\pcre_stringpiece.h.in;..\pcrecpparg.h.in;..\pcre_chartables.c.dist;..\CMakeLists.txt;"
+ Outputs="CMakeFiles\generate.stamp"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="MinSizeRel|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ Description=""
+ CommandLine=""
+ AdditionalDependencies=""
+ Outputs=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="RelWithDebInfo|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Building Custom Rule D:/Work/WinMerge/WinMerge_SVN/Externals/pcre/CMakeLists.txt"
+ CommandLine=""C:\Program Files\CMake 2.8\bin\cmake.exe" -HD:/Work/WinMerge/WinMerge_SVN/Externals/pcre -B. --check-stamp-file CMakeFiles/generate.stamp
"
+ AdditionalDependencies="..\CMakeLists.txt;.\CMakeFiles\CMakeSystem.cmake;.\CMakeFiles\CMakeCCompiler.cmake;.\CMakeFiles\CMakeCXXCompiler.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeSystemSpecificInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeGenericSystem.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\gcc.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\Windows.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\WindowsPaths.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\Windows-cl.cmake";.\CMakeFiles\CMakeCPlatform.cmake;.\CMakeFiles\CMakeCXXPlatform.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\Platform\cl.cmake";.\CMakeFiles\CMakeRCCompiler.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeRCInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCommonLanguageInclude.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCXXInformation.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CMakeCommonLanguageInclude.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\FindBZip2.cmake";..\cmake\FindPackageHandleStandardArgs.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\FindZLIB.cmake";..\cmake\FindPackageHandleStandardArgs.cmake;..\cmake\FindReadline.cmake;..\cmake\FindPackageHandleStandardArgs.cmake;"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckIncludeFile.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckIncludeFileCXX.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckFunctionExists.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckTypeSize.cmake";"C:\Program Files\CMake 2.8\share\cmake-2.8\Modules\CheckIncludeFile.cmake";..\config-cmake.h.in;..\pcre.h.generic;..\pcre_stringpiece.h.in;..\pcrecpparg.h.in;..\pcre_chartables.c.dist;..\CMakeLists.txt;"
+ Outputs="CMakeFiles\generate.stamp"
+ />
+ </FileConfiguration>
+ </File>
</Files>
<Globals>
</Globals>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-12-29 18:22:53
|
Revision: 7068
http://winmerge.svn.sourceforge.net/winmerge/?rev=7068&view=rev
Author: kimmov
Date: 2009-12-29 18:22:40 +0000 (Tue, 29 Dec 2009)
Log Message:
-----------
Update PCRE to version 8.00.
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Externals/pcre/132html
trunk/Externals/pcre/ChangeLog
trunk/Externals/pcre/HACKING
trunk/Externals/pcre/LICENCE
trunk/Externals/pcre/Makefile.am
trunk/Externals/pcre/Makefile.in
trunk/Externals/pcre/NEWS
trunk/Externals/pcre/NON-UNIX-USE
trunk/Externals/pcre/PrepareRelease
trunk/Externals/pcre/README
trunk/Externals/pcre/RunGrepTest
trunk/Externals/pcre/RunTest
trunk/Externals/pcre/RunTest.bat
trunk/Externals/pcre/Win32/ALL_BUILD.vcproj
trunk/Externals/pcre/Win32/CMakeCache.txt
trunk/Externals/pcre/Win32/CMakeFiles/CMakeCCompiler.cmake
trunk/Externals/pcre/Win32/CMakeFiles/CMakeCPlatform.cmake
trunk/Externals/pcre/Win32/CMakeFiles/CMakeCXXCompiler.cmake
trunk/Externals/pcre/Win32/CMakeFiles/CMakeCXXPlatform.cmake
trunk/Externals/pcre/Win32/CMakeFiles/CMakeDetermineCompilerABI_C.bin
trunk/Externals/pcre/Win32/CMakeFiles/CMakeDetermineCompilerABI_CXX.bin
trunk/Externals/pcre/Win32/CMakeFiles/CMakeRCCompiler.cmake
trunk/Externals/pcre/Win32/CMakeFiles/CMakeSystem.cmake
trunk/Externals/pcre/Win32/CMakeFiles/CheckTypeSize.bin
trunk/Externals/pcre/Win32/CMakeFiles/generate.stamp.depend
trunk/Externals/pcre/Win32/CTestCustom.ctest
trunk/Externals/pcre/Win32/CTestTestfile.cmake
trunk/Externals/pcre/Win32/INSTALL.vcproj
trunk/Externals/pcre/Win32/PCRE.sln
trunk/Externals/pcre/Win32/RUN_TESTS.vcproj
trunk/Externals/pcre/Win32/cmake_install.cmake
trunk/Externals/pcre/Win32/pcre.h
trunk/Externals/pcre/Win32/pcre.vcproj
trunk/Externals/pcre/Win32/pcre_scanner_unittest.vcproj
trunk/Externals/pcre/Win32/pcre_stringpiece_unittest.vcproj
trunk/Externals/pcre/Win32/pcrecpp.vcproj
trunk/Externals/pcre/Win32/pcrecpp_unittest.vcproj
trunk/Externals/pcre/Win32/pcregrep.vcproj
trunk/Externals/pcre/Win32/pcreposix.vcproj
trunk/Externals/pcre/Win32/pcretest.vcproj
trunk/Externals/pcre/aclocal.m4
trunk/Externals/pcre/config.guess
trunk/Externals/pcre/config.h.generic
trunk/Externals/pcre/config.h.in
trunk/Externals/pcre/config.sub
trunk/Externals/pcre/configure
trunk/Externals/pcre/configure.ac
trunk/Externals/pcre/doc/html/index.html
trunk/Externals/pcre/doc/html/pcre.html
trunk/Externals/pcre/doc/html/pcre_compile.html
trunk/Externals/pcre/doc/html/pcre_compile2.html
trunk/Externals/pcre/doc/html/pcre_dfa_exec.html
trunk/Externals/pcre/doc/html/pcre_exec.html
trunk/Externals/pcre/doc/html/pcre_fullinfo.html
trunk/Externals/pcre/doc/html/pcreapi.html
trunk/Externals/pcre/doc/html/pcrebuild.html
trunk/Externals/pcre/doc/html/pcrecallout.html
trunk/Externals/pcre/doc/html/pcrecompat.html
trunk/Externals/pcre/doc/html/pcregrep.html
trunk/Externals/pcre/doc/html/pcrematching.html
trunk/Externals/pcre/doc/html/pcrepartial.html
trunk/Externals/pcre/doc/html/pcrepattern.html
trunk/Externals/pcre/doc/html/pcreposix.html
trunk/Externals/pcre/doc/html/pcresample.html
trunk/Externals/pcre/doc/html/pcretest.html
trunk/Externals/pcre/doc/index.html.src
trunk/Externals/pcre/doc/pcre.3
trunk/Externals/pcre/doc/pcre.txt
trunk/Externals/pcre/doc/pcre_compile.3
trunk/Externals/pcre/doc/pcre_compile2.3
trunk/Externals/pcre/doc/pcre_dfa_exec.3
trunk/Externals/pcre/doc/pcre_exec.3
trunk/Externals/pcre/doc/pcre_fullinfo.3
trunk/Externals/pcre/doc/pcreapi.3
trunk/Externals/pcre/doc/pcrebuild.3
trunk/Externals/pcre/doc/pcrecallout.3
trunk/Externals/pcre/doc/pcrecompat.3
trunk/Externals/pcre/doc/pcregrep.1
trunk/Externals/pcre/doc/pcregrep.txt
trunk/Externals/pcre/doc/pcrematching.3
trunk/Externals/pcre/doc/pcrepartial.3
trunk/Externals/pcre/doc/pcrepattern.3
trunk/Externals/pcre/doc/pcreposix.3
trunk/Externals/pcre/doc/pcresample.3
trunk/Externals/pcre/doc/pcretest.1
trunk/Externals/pcre/doc/pcretest.txt
trunk/Externals/pcre/doc/perltest.txt
trunk/Externals/pcre/libpcre.pc.in
trunk/Externals/pcre/libpcrecpp.pc.in
trunk/Externals/pcre/ltmain.sh
trunk/Externals/pcre/pcre-config.in
trunk/Externals/pcre/pcre.h.generic
trunk/Externals/pcre/pcre.h.in
trunk/Externals/pcre/pcre_compile.c
trunk/Externals/pcre/pcre_dfa_exec.c
trunk/Externals/pcre/pcre_exec.c
trunk/Externals/pcre/pcre_fullinfo.c
trunk/Externals/pcre/pcre_internal.h
trunk/Externals/pcre/pcre_printint.src
trunk/Externals/pcre/pcre_study.c
trunk/Externals/pcre/pcre_try_flipped.c
trunk/Externals/pcre/pcre_ucd.c
trunk/Externals/pcre/pcredemo.c
trunk/Externals/pcre/pcregrep.c
trunk/Externals/pcre/pcreposix.c
trunk/Externals/pcre/pcreposix.h
trunk/Externals/pcre/pcretest.c
trunk/Externals/pcre/perltest.pl
trunk/Externals/pcre/testdata/grepoutput
trunk/Externals/pcre/testdata/testinput1
trunk/Externals/pcre/testdata/testinput10
trunk/Externals/pcre/testdata/testinput2
trunk/Externals/pcre/testdata/testinput3
trunk/Externals/pcre/testdata/testinput4
trunk/Externals/pcre/testdata/testinput5
trunk/Externals/pcre/testdata/testinput6
trunk/Externals/pcre/testdata/testinput7
trunk/Externals/pcre/testdata/testinput8
trunk/Externals/pcre/testdata/testinput9
trunk/Externals/pcre/testdata/testoutput1
trunk/Externals/pcre/testdata/testoutput10
trunk/Externals/pcre/testdata/testoutput2
trunk/Externals/pcre/testdata/testoutput3
trunk/Externals/pcre/testdata/testoutput4
trunk/Externals/pcre/testdata/testoutput5
trunk/Externals/pcre/testdata/testoutput6
trunk/Externals/pcre/testdata/testoutput7
trunk/Externals/pcre/testdata/testoutput8
trunk/Externals/pcre/testdata/testoutput9
trunk/Externals/pcre/testdata/wintestoutput3
trunk/Externals/scew/win32/scew.vcproj
trunk/Externals/versions.txt
Added Paths:
-----------
trunk/Externals/pcre/Win32/CMakeFiles/TargetDirectories.txt
trunk/Externals/pcre/Win32/CMakeFiles/ZERO_CHECK.rule
trunk/Externals/pcre/Win32/CMakeFiles/generate.stamp.list
trunk/Externals/pcre/Win32/ZERO_CHECK.vcproj
trunk/Externals/pcre/doc/html/pcredemo.html
trunk/Externals/pcre/libpcreposix.pc.in
trunk/Externals/pcre/testdata/testinput11
trunk/Externals/pcre/testdata/testinput12
trunk/Externals/pcre/testdata/testoutput11
trunk/Externals/pcre/testdata/testoutput12
Removed Paths:
-------------
trunk/Externals/pcre/Win32/PCRE_fullsolution.sln
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2009-12-29 14:22:46 UTC (rev 7067)
+++ trunk/Docs/Users/ChangeLog.txt 2009-12-29 18:22:40 UTC (rev 7068)
@@ -5,6 +5,7 @@
WinMerge 2.3.11
Write config log as UTF-8 file (r7057)
+ Update PCRE to version 8.00 (r7068)
Bugfix: Plugin error after interrupting folder compare (#2919475)
Bugfix: GUI Word Wrap missing text (#2921400, #2894033)
Bugfix: Selected custom odepage was not used (#2921555)
Modified: trunk/Externals/pcre/132html
===================================================================
--- trunk/Externals/pcre/132html 2009-12-29 14:22:46 UTC (rev 7067)
+++ trunk/Externals/pcre/132html 2009-12-29 18:22:40 UTC (rev 7068)
@@ -232,6 +232,23 @@
redo; # Process the joined lines
}
+ # .EX/.EE are used in the pcredemo page to bracket the entire program,
+ # which is unmodified except for turning backslash into "\e".
+
+ elsif (/^\.EX\s*$/)
+ {
+ print TEMP "<PRE>\n";
+ while (<STDIN>)
+ {
+ last if /^\.EE\s*$/;
+ s/\\e/\\/g;
+ s/&/&/g;
+ s/</</g;
+ s/>/>/g;
+ print TEMP;
+ }
+ }
+
# Ignore anything not recognized
next;
Modified: trunk/Externals/pcre/ChangeLog
===================================================================
--- trunk/Externals/pcre/ChangeLog 2009-12-29 14:22:46 UTC (rev 7067)
+++ trunk/Externals/pcre/ChangeLog 2009-12-29 18:22:40 UTC (rev 7068)
@@ -1,6 +1,170 @@
ChangeLog for PCRE
------------------
+Version 8.00 19-Oct-09
+----------------------
+
+1. The table for translating pcre_compile() error codes into POSIX error codes
+ was out-of-date, and there was no check on the pcre_compile() error code
+ being within the table. This could lead to an OK return being given in
+ error.
+
+2. Changed the call to open a subject file in pcregrep from fopen(pathname,
+ "r") to fopen(pathname, "rb"), which fixed a problem with some of the tests
+ in a Windows environment.
+
+3. The pcregrep --count option prints the count for each file even when it is
+ zero, as does GNU grep. However, pcregrep was also printing all files when
+ --files-with-matches was added. Now, when both options are given, it prints
+ counts only for those files that have at least one match. (GNU grep just
+ prints the file name in this circumstance, but including the count seems
+ more useful - otherwise, why use --count?) Also ensured that the
+ combination -clh just lists non-zero counts, with no names.
+
+4. The long form of the pcregrep -F option was incorrectly implemented as
+ --fixed_strings instead of --fixed-strings. This is an incompatible change,
+ but it seems right to fix it, and I didn't think it was worth preserving
+ the old behaviour.
+
+5. The command line items --regex=pattern and --regexp=pattern were not
+ recognized by pcregrep, which required --regex pattern or --regexp pattern
+ (with a space rather than an '='). The man page documented the '=' forms,
+ which are compatible with GNU grep; these now work.
+
+6. No libpcreposix.pc file was created for pkg-config; there was just
+ libpcre.pc and libpcrecpp.pc. The omission has been rectified.
+
+7. Added #ifndef SUPPORT_UCP into the pcre_ucd.c module, to reduce its size
+ when UCP support is not needed, by modifying the Python script that
+ generates it from Unicode data files. This should not matter if the module
+ is correctly used as a library, but I received one complaint about 50K of
+ unwanted data. My guess is that the person linked everything into his
+ program rather than using a library. Anyway, it does no harm.
+
+8. A pattern such as /\x{123}{2,2}+/8 was incorrectly compiled; the trigger
+ was a minimum greater than 1 for a wide character in a possessive
+ repetition. The same bug could also affect patterns like /(\x{ff}{0,2})*/8
+ which had an unlimited repeat of a nested, fixed maximum repeat of a wide
+ character. Chaos in the form of incorrect output or a compiling loop could
+ result.
+
+9. The restrictions on what a pattern can contain when partial matching is
+ requested for pcre_exec() have been removed. All patterns can now be
+ partially matched by this function. In addition, if there are at least two
+ slots in the offset vector, the offset of the earliest inspected character
+ for the match and the offset of the end of the subject are set in them when
+ PCRE_ERROR_PARTIAL is returned.
+
+10. Partial matching has been split into two forms: PCRE_PARTIAL_SOFT, which is
+ synonymous with PCRE_PARTIAL, for backwards compatibility, and
+ PCRE_PARTIAL_HARD, which causes a partial match to supersede a full match,
+ and may be more useful for multi-segment matching.
+
+11. Partial matching with pcre_exec() is now more intuitive. A partial match
+ used to be given if ever the end of the subject was reached; now it is
+ given only if matching could not proceed because another character was
+ needed. This makes a difference in some odd cases such as Z(*FAIL) with the
+ string "Z", which now yields "no match" instead of "partial match". In the
+ case of pcre_dfa_exec(), "no match" is given if every matching path for the
+ final character ended with (*FAIL).
+
+12. Restarting a match using pcre_dfa_exec() after a partial match did not work
+ if the pattern had a "must contain" character that was already found in the
+ earlier partial match, unless partial matching was again requested. For
+ example, with the pattern /dog.(body)?/, the "must contain" character is
+ "g". If the first part-match was for the string "dog", restarting with
+ "sbody" failed. This bug has been fixed.
+
+13. The string returned by pcre_dfa_exec() after a partial match has been
+ changed so that it starts at the first inspected character rather than the
+ first character of the match. This makes a difference only if the pattern
+ starts with a lookbehind assertion or \b or \B (\K is not supported by
+ pcre_dfa_exec()). It's an incompatible change, but it makes the two
+ matching functions compatible, and I think it's the right thing to do.
+
+14. Added a pcredemo man page, created automatically from the pcredemo.c file,
+ so that the demonstration program is easily available in environments where
+ PCRE has not been installed from source.
+
+15. Arranged to add -DPCRE_STATIC to cflags in libpcre.pc, libpcreposix.cp,
+ libpcrecpp.pc and pcre-config when PCRE is not compiled as a shared
+ library.
+
+16. Added REG_UNGREEDY to the pcreposix interface, at the request of a user.
+ It maps to PCRE_UNGREEDY. It is not, of course, POSIX-compatible, but it
+ is not the first non-POSIX option to be added. Clearly some people find
+ these options useful.
+
+17. If a caller to the POSIX matching function regexec() passes a non-zero
+ value for nmatch with a NULL value for pmatch, the value of
+ nmatch is forced to zero.
+
+18. RunGrepTest did not have a test for the availability of the -u option of
+ the diff command, as RunTest does. It now checks in the same way as
+ RunTest, and also checks for the -b option.
+
+19. If an odd number of negated classes containing just a single character
+ interposed, within parentheses, between a forward reference to a named
+ subpattern and the definition of the subpattern, compilation crashed with
+ an internal error, complaining that it could not find the referenced
+ subpattern. An example of a crashing pattern is /(?&A)(([^m])(?<A>))/.
+ [The bug was that it was starting one character too far in when skipping
+ over the character class, thus treating the ] as data rather than
+ terminating the class. This meant it could skip too much.]
+
+20. Added PCRE_NOTEMPTY_ATSTART in order to be able to correctly implement the
+ /g option in pcretest when the pattern contains \K, which makes it possible
+ to have an empty string match not at the start, even when the pattern is
+ anchored. Updated pcretest and pcredemo to use this option.
+
+21. If the maximum number of capturing subpatterns in a recursion was greater
+ than the maximum at the outer level, the higher number was returned, but
+ with unset values at the outer level. The correct (outer level) value is
+ now given.
+
+22. If (*ACCEPT) appeared inside capturing parentheses, previous releases of
+ PCRE did not set those parentheses (unlike Perl). I have now found a way to
+ make it do so. The string so far is captured, making this feature
+ compatible with Perl.
+
+23. The tests have been re-organized, adding tests 11 and 12, to make it
+ possible to check the Perl 5.10 features against Perl 5.10.
+
+24. Perl 5.10 allows subroutine calls in lookbehinds, as long as the subroutine
+ pattern matches a fixed length string. PCRE did not allow this; now it
+ does. Neither allows recursion.
+
+25. I finally figured out how to implement a request to provide the minimum
+ length of subject string that was needed in order to match a given pattern.
+ (It was back references and recursion that I had previously got hung up
+ on.) This code has now been added to pcre_study(); it finds a lower bound
+ to the length of subject needed. It is not necessarily the greatest lower
+ bound, but using it to avoid searching strings that are too short does give
+ some useful speed-ups. The value is available to calling programs via
+ pcre_fullinfo().
+
+26. While implementing 25, I discovered to my embarrassment that pcretest had
+ not been passing the result of pcre_study() to pcre_dfa_exec(), so the
+ study optimizations had never been tested with that matching function.
+ Oops. What is worse, even when it was passed study data, there was a bug in
+ pcre_dfa_exec() that meant it never actually used it. Double oops. There
+ were also very few tests of studied patterns with pcre_dfa_exec().
+
+27. If (?| is used to create subpatterns with duplicate numbers, they are now
+ allowed to have the same name, even if PCRE_DUPNAMES is not set. However,
+ on the other side of the coin, they are no longer allowed to have different
+ names, because these cannot be distinguished in PCRE, and this has caused
+ confusion. (This is a difference from Perl.)
+
+28. When duplicate subpattern names are present (necessarily with different
+ numbers, as required by 27 above), and a test is made by name in a
+ conditional pattern, either for a subpattern having been matched, or for
+ recursion in such a pattern, all the associated numbered subpatterns are
+ tested, and the overall condition is true if the condition is true for any
+ one of them. This is the way Perl works, and is also more like the way
+ testing by number works.
+
+
Version 7.9 11-Apr-09
---------------------
Modified: trunk/Externals/pcre/HACKING
===================================================================
--- trunk/Externals/pcre/HACKING 2009-12-29 14:22:46 UTC (rev 7067)
+++ trunk/Externals/pcre/HACKING 2009-12-29 18:22:40 UTC (rev 7068)
@@ -67,22 +67,22 @@
functions to work this way. This got rid of about 600 lines of source. It
should make future maintenance and development easier. As this was such a major
change, I never released 6.8, instead upping the number to 7.0 (other quite
-major changes are also present in the 7.0 release).
+major changes were also present in the 7.0 release).
-A side effect of this work is that the previous limit of 200 on the nesting
+A side effect of this work was that the previous limit of 200 on the nesting
depth of parentheses was removed. However, there is a downside: pcre_compile()
runs more slowly than before (30% or more, depending on the pattern) because it
-is doing a full analysis of the pattern. My hope is that this is not a big
-issue.
+is doing a full analysis of the pattern. My hope was that this would not be a
+big issue, and in the event, nobody has commented on it.
Traditional matching function
-----------------------------
The "traditional", and original, matching function is called pcre_exec(), and
it implements an NFA algorithm, similar to the original Henry Spencer algorithm
-and the way that Perl works. Not surprising, since it is intended to be as
-compatible with Perl as possible. This is the function most users of PCRE will
-use most of the time.
+and the way that Perl works. This is not surprising, since it is intended to be
+as compatible with Perl as possible. This is the function most users of PCRE
+will use most of the time.
Supplementary matching function
-------------------------------
@@ -119,6 +119,7 @@
A list of the opcodes follows:
+
Opcodes with no following data
------------------------------
@@ -150,12 +151,12 @@
OP_EXTUNI match an extended Unicode character
OP_ANYNL match any Unicode newline sequence
- OP_ACCEPT )
- OP_COMMIT )
- OP_FAIL ) These are Perl 5.10's "backtracking
- OP_PRUNE ) control verbs".
- OP_SKIP )
- OP_THEN )
+ OP_ACCEPT ) These are Perl 5.10's "backtracking
+ OP_COMMIT ) control verbs". If OP_ACCEPT is inside
+ OP_FAIL ) capturing parentheses, it may be preceded
+ OP_PRUNE ) by one or more OP_CLOSE, followed by a 2-byte
+ OP_SKIP ) number, indicating which parentheses must be
+ OP_THEN ) closed.
Repeating single characters
@@ -372,14 +373,17 @@
OP_SCOND for one that might match an empty string in an unbounded repeat. If
the condition is a back reference, this is stored at the start of the
subpattern using the opcode OP_CREF followed by two bytes containing the
-reference number. If the condition is "in recursion" (coded as "(?(R)"), or "in
-recursion of group x" (coded as "(?(Rx)"), the group number is stored at the
-start of the subpattern using the opcode OP_RREF, and a value of zero for "the
-whole pattern". For a DEFINE condition, just the single byte OP_DEF is used (it
-has no associated data). Otherwise, a conditional subpattern always starts with
-one of the assertions.
+reference number. OP_NCREF is used instead if the reference was generated by
+name (so that the runtime code knows to check for duplicate names).
+If the condition is "in recursion" (coded as "(?(R)"), or "in recursion of
+group x" (coded as "(?(Rx)"), the group number is stored at the start of the
+subpattern using the opcode OP_RREF or OP_NRREF (cf OP_NCREF), and a value of
+zero for "the whole pattern". For a DEFINE condition, just the single byte
+OP_DEF is used (it has no associated data). Otherwise, a conditional subpattern
+always starts with one of the assertions.
+
Recursion
---------
@@ -415,4 +419,4 @@
data.
Philip Hazel
-April 2008
+October 2009
Modified: trunk/Externals/pcre/LICENCE
===================================================================
--- trunk/Externals/pcre/LICENCE 2009-12-29 14:22:46 UTC (rev 7067)
+++ trunk/Externals/pcre/LICENCE 2009-12-29 18:22:40 UTC (rev 7068)
@@ -4,7 +4,7 @@
PCRE is a library of functions to support regular expressions whose syntax
and semantics are as close as possible to those of the Perl 5 language.
-Release 7 of PCRE is distributed under the terms of the "BSD" licence, as
+Release 8 of PCRE is distributed under the terms of the "BSD" licence, as
specified below. The documentation for PCRE, supplied in the "doc"
directory, is distributed under the same terms as the software itself.
Modified: trunk/Externals/pcre/Makefile.am
===================================================================
--- trunk/Externals/pcre/Makefile.am 2009-12-29 14:22:46 UTC (rev 7067)
+++ trunk/Externals/pcre/Makefile.am 2009-12-29 18:22:40 UTC (rev 7068)
@@ -40,6 +40,7 @@
doc/html/pcrebuild.html \
doc/html/pcrecallout.html \
doc/html/pcrecompat.html \
+ doc/html/pcredemo.html \
doc/html/pcregrep.html \
doc/html/pcrematching.html \
doc/html/pcrepartial.html \
@@ -270,6 +271,8 @@
testdata/testinput8 \
testdata/testinput9 \
testdata/testinput10 \
+ testdata/testinput11 \
+ testdata/testinput12 \
testdata/testoutput1 \
testdata/testoutput2 \
testdata/testoutput3 \
@@ -280,6 +283,8 @@
testdata/testoutput8 \
testdata/testoutput9 \
testdata/testoutput10 \
+ testdata/testoutput11 \
+ testdata/testoutput12 \
testdata/wintestinput3 \
testdata/wintestoutput3 \
perltest.pl
@@ -327,7 +332,7 @@
# We have .pc files for pkg-config users.
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libpcre.pc
+pkgconfig_DATA = libpcre.pc libpcreposix.pc
if WITH_PCRE_CPP
pkgconfig_DATA += libpcrecpp.pc
endif
Modified: trunk/Externals/pcre/Makefile.in
===================================================================
--- trunk/Externals/pcre/Makefile.in 2009-12-29 14:22:46 UTC (rev 7067)
+++ trunk/Externals/pcre/Makefile.in 2009-12-29 18:22:40 UTC (rev 7068)
@@ -66,11 +66,11 @@
$(dist_noinst_DATA) $(dist_noinst_SCRIPTS) \
$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(srcdir)/config.h.in $(srcdir)/libpcre.pc.in \
- $(srcdir)/libpcrecpp.pc.in $(srcdir)/pcre-config.in \
- $(srcdir)/pcre.h.in $(srcdir)/pcre_stringpiece.h.in \
- $(srcdir)/pcrecpparg.h.in $(top_srcdir)/configure AUTHORS \
- COPYING ChangeLog INSTALL NEWS config.guess config.sub depcomp \
- install-sh ltmain.sh missing
+ $(srcdir)/libpcrecpp.pc.in $(srcdir)/libpcreposix.pc.in \
+ $(srcdir)/pcre-config.in $(srcdir)/pcre.h.in \
+ $(srcdir)/pcre_stringpiece.h.in $(srcdir)/pcrecpparg.h.in \
+ $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
+ config.guess config.sub depcomp install-sh ltmain.sh missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -79,8 +79,8 @@
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = libpcre.pc libpcrecpp.pc pcre-config pcre.h \
- pcre_stringpiece.h pcrecpparg.h
+CONFIG_CLEAN_FILES = libpcre.pc libpcreposix.pc libpcrecpp.pc \
+ pcre-config pcre.h pcre_stringpiece.h pcrecpparg.h
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -247,7 +247,7 @@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -256,14 +256,14 @@
EXTRA_LIBPCRECPP_LDFLAGS = @EXTRA_LIBPCRECPP_LDFLAGS@
EXTRA_LIBPCREPOSIX_LDFLAGS = @EXTRA_LIBPCREPOSIX_LDFLAGS@
EXTRA_LIBPCRE_LDFLAGS = @EXTRA_LIBPCRE_LDFLAGS@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
GREP = @GREP@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LIBBZ2 = @LIBBZ2@
LIBOBJS = @LIBOBJS@
@@ -271,13 +271,17 @@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIBZ = @LIBZ@
+LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
+NM = @NM@
NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -289,6 +293,7 @@
PCRE_MAJOR = @PCRE_MAJOR@
PCRE_MINOR = @PCRE_MINOR@
PCRE_PRERELEASE = @PCRE_PRERELEASE@
+PCRE_STATIC_CFLAG = @PCRE_STATIC_CFLAG@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
@@ -301,7 +306,7 @@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -332,6 +337,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -391,6 +397,7 @@
doc/html/pcrebuild.html \
doc/html/pcrecallout.html \
doc/html/pcrecompat.html \
+ doc/html/pcredemo.html \
doc/html/pcregrep.html \
doc/html/pcrematching.html \
doc/html/pcrepartial.html \
@@ -449,12 +456,14 @@
testdata/testinput1 testdata/testinput2 testdata/testinput3 \
testdata/testinput4 testdata/testinput5 testdata/testinput6 \
testdata/testinput7 testdata/testinput8 testdata/testinput9 \
- testdata/testinput10 testdata/testoutput1 testdata/testoutput2 \
- testdata/testoutput3 testdata/testoutput4 testdata/testoutput5 \
- testdata/testoutput6 testdata/testoutput7 testdata/testoutput8 \
- testdata/testoutput9 testdata/testoutput10 \
- testdata/wintestinput3 testdata/wintestoutput3 perltest.pl \
- pcredemo.c $(pcrecpp_man) cmake/COPYING-CMAKE-SCRIPTS \
+ testdata/testinput10 testdata/testinput11 testdata/testinput12 \
+ testdata/testoutput1 testdata/testoutput2 testdata/testoutput3 \
+ testdata/testoutput4 testdata/testoutput5 testdata/testoutput6 \
+ testdata/testoutput7 testdata/testoutput8 testdata/testoutput9 \
+ testdata/testoutput10 testdata/testoutput11 \
+ testdata/testoutput12 testdata/wintestinput3 \
+ testdata/wintestoutput3 perltest.pl pcredemo.c $(pcrecpp_man) \
+ cmake/COPYING-CMAKE-SCRIPTS \
cmake/FindPackageHandleStandardArgs.cmake \
cmake/FindReadline.cmake CMakeLists.txt config-cmake.h.in
@@ -530,7 +539,7 @@
# We have .pc files for pkg-config users.
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libpcre.pc $(am__append_7)
+pkgconfig_DATA = libpcre.pc libpcreposix.pc $(am__append_7)
dist_man_MANS = \
doc/pcre.3 \
doc/pcre-config.1 \
@@ -629,6 +638,8 @@
-rm -f config.h stamp-h1
libpcre.pc: $(top_builddir)/config.status $(srcdir)/libpcre.pc.in
cd $(top_builddir) && $(SHELL) ./config.status $@
+libpcreposix.pc: $(top_builddir)/config.status $(srcdir)/libpcreposix.pc.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
libpcrecpp.pc: $(top_builddir)/config.status $(srcdir)/libpcrecpp.pc.in
cd $(top_builddir) && $(SHELL) ./config.status $@
pcre-config: $(top_builddir)/config.status $(srcdir)/pcre-config.in
Modified: trunk/Externals/pcre/NEWS
===================================================================
--- trunk/Externals/pcre/NEWS 2009-12-29 14:22:46 UTC (rev 7067)
+++ trunk/Externals/pcre/NEWS 2009-12-29 18:22:40 UTC (rev 7068)
@@ -1,6 +1,21 @@
News about PCRE releases
------------------------
+Release 8.00 19-Oct-09
+----------------------
+
+Bugs have been fixed in the library and in pcregrep. There are also some
+enhancements. Restrictions on patterns used for partial matching have been
+removed, extra information is given for partial matches, the partial matching
+process has been improved, and an option to make a partial match override a
+full match is available. The "study" process has been enhanced by finding a
+lower bound matching length. Groups with duplicate numbers may now have
+duplicated names without the use of PCRE_DUPNAMES. However, they may not have
+different names. The documentation has been revised to reflect these changes.
+The version number has been expanded to 3 digits as it is clear that the rate
+of change is not slowing down.
+
+
Release 7.9 11-Apr-09
---------------------
Modified: trunk/Externals/pcre/NON-UNIX-USE
===================================================================
--- trunk/Externals/pcre/NON-UNIX-USE 2009-12-29 14:22:46 UTC (rev 7067)
+++ trunk/Externals/pcre/NON-UNIX-USE 2009-12-29 18:22:40 UTC (rev 7068)
@@ -12,9 +12,10 @@
Comments about Win32 builds
Building PCRE on Windows with CMake
Use of relative paths with CMake on Windows
- Testing with runtest.bat
+ Testing with RunTest.bat
Building under Windows with BCC5.5
Building PCRE on OpenVMS
+ Building PCRE on Stratus OpenVOS
GENERAL
@@ -36,10 +37,10 @@
The PCRE distribution includes a "configure" file for use by the Configure/Make
build system, as found in many Unix-like environments. There is also support
-support for CMake, which some users prefer, in particular in Windows
-environments. There are some instructions for CMake under Windows in the
-section entitled "Building PCRE with CMake" below. CMake can also be used to
-build PCRE in Unix-like systems.
+support for CMake, which some users prefer, especially in Windows environments.
+There are some instructions for CMake under Windows in the section entitled
+"Building PCRE with CMake" below. CMake can also be used to build PCRE in
+Unix-like systems.
GENERIC INSTRUCTIONS FOR THE PCRE C LIBRARY
@@ -278,40 +279,42 @@
BUILDING PCRE ON WINDOWS WITH CMAKE
-CMake is an alternative build facility that can be used instead of the
-traditional Unix "configure". CMake version 2.4.7 supports Borland makefiles,
-MinGW makefiles, MSYS makefiles, NMake makefiles, UNIX makefiles, Visual Studio
-6, Visual Studio 7, Visual Studio 8, and Watcom W8. The following instructions
+CMake is an alternative configuration facility that can be used instead of the
+traditional Unix "configure". CMake creates project files (make files, solution
+files, etc.) tailored to numerous development environments, including Visual
+Studio, Borland, Msys, MinGW, NMake, and Unix. The following instructions
were contributed by a PCRE user.
-1. Download CMake 2.4.7 or above from http://www.cmake.org/, install and ensure
- that cmake\bin is on your path.
+1. Install the latest CMake version available from http://www.cmake.org/, and
+ ensure that cmake\bin is on your path.
2. Unzip (retaining folder structure) the PCRE source tree into a source
directory such as C:\pcre.
-3. Create a new, empty build directory: C:\pcre\build\
+3. Create a new, empty build directory, for example C:\pcre\build\
-4. Run CMakeSetup from the Shell envirornment of your build tool, e.g., Msys
- for Msys/MinGW or Visual Studio Command Prompt for VC/VC++
+4. Run cmake-gui from the Shell envirornment of your build tool, for example,
+ Msys for Msys/MinGW or Visual Studio Command Prompt for VC/VC++.
5. Enter C:\pcre\pcre-xx and C:\pcre\build for the source and build
- directories, respectively
+ directories, respectively.
6. Hit the "Configure" button.
-7. Select the particular IDE / build tool that you are using (Visual Studio,
- MSYS makefiles, MinGW makefiles, etc.)
+7. Select the particular IDE / build tool that you are using (Visual
+ Studio, MSYS makefiles, MinGW makefiles, etc.)
-8. The GUI will then list several configuration options. This is where you can
- enable UTF-8 support, etc.
+8. The GUI will then list several configuration options. This is where
+ you can enable UTF-8 support or other PCRE optional features.
-9. Hit "Configure" again. The adjacent "OK" button should now be active.
+9. Hit "Configure" again. The adjacent "Generate" button should now be
+ active.
-10. Hit "OK".
+10. Hit "Generate".
11. The build directory should now contain a usable build system, be it a
- solution file for Visual Studio, makefiles for MinGW, etc.
+ solution file for Visual Studio, makefiles for MinGW, etc. Exit from
+ cmake-gui and use the generated build system with your compiler or IDE.
USE OF RELATIVE PATHS WITH CMAKE ON WINDOWS
@@ -444,5 +447,52 @@
$!
=========================
-Last Updated: 17 March 2009
+
+BUILDING PCRE ON STRATUS OPENVOS
+
+These notes on the port of PCRE to VOS (lightly edited) were supplied by
+Ashutosh Warikoo, whose email address has the local part awarikoo and the
+domain nse.co.in. The port was for version 7.9 in August 2009.
+
+1. Building PCRE
+
+I built pcre on OpenVOS Release 17.0.1at using GNU Tools 3.4a without any
+problems. I used the following packages to build PCRE:
+
+ ftp://ftp.stratus.com/pub/vos/posix/ga/posix.save.evf.gz
+
+Please read and follow the instructions that come with these packages. To start
+the build of pcre, from the root of the package type:
+
+ ./build.sh
+
+2. Installing PCRE
+
+Once you have successfully built PCRE, login to the SysAdmin group, switch to
+the root user, and type
+
+ [ !create_dir (master_disk)>usr --if needed ]
+ [ !create_dir (master_disk)>usr>local --if needed ]
+ !gmake install
+
+This installs PCRE and its man pages into /usr/local. You can add
+(master_disk)>usr>local>bin to your command search paths, or if you are in
+BASH, add /usr/local/bin to the PATH environment variable.
+
+4. Restrictions
+
+This port requires readline library optionally. However during the build I
+faced some yet unexplored errors while linking with readline. As it was an
+optional component I chose to disable it.
+
+5. Known Problems
+
+I ran a the test suite, but you will have to be your own judge of whether this
+command, and this port, suits your purposes. If you find any problems that
+appear to be related to the port itself, please let me know. Please see the
+build.log file in the root of the package also.
+
+
+=========================
+Last Updated: 05 October 2009
****
Modified: trunk/Externals/pcre/PrepareRelease
===================================================================
--- trunk/Externals/pcre/PrepareRelease 2009-12-29 14:22:46 UTC (rev 7067)
+++ trunk/Externals/pcre/PrepareRelease 2009-12-29 18:22:40 UTC (rev 7068)
@@ -4,12 +4,13 @@
# processing of the documentation, detrails files, and creates pcre.h.generic
# and config.h.generic (for use by builders who can't run ./configure).
-# You must run this script before runnning "make dist". It makes use of the
-# following files:
+# You must run this script before runnning "make dist". If its first argument
+# is "doc", it stops after preparing the documentation. There are no other
+# arguments. The script makes use of the following files:
# 132html A Perl script that converts a .1 or .3 man page into HTML. It
-# is called from MakeRelease. It "knows" the relevant troff
-# constructs that are used in the PCRE man pages.
+# "knows" the relevant troff constructs that are used in the PCRE
+# man pages.
# CleanTxt A Perl script that cleans up the output of "nroff -man" by
# removing backspaces and other redundant text so as to produce
@@ -37,8 +38,9 @@
This file contains a concatenation of the PCRE man pages, converted to plain
text format for ease of searching with a text editor, or for use on systems
that do not have a man page processor. The small individual files that give
-synopses of each function in the library have not been included. There are
-separate text files for the pcregrep and pcretest commands.
+synopses of each function in the library have not been included. Neither has
+the pcredemo program. There are separate text files for the pcregrep and
+pcretest commands.
-----------------------------------------------------------------------------
@@ -68,6 +70,41 @@
done
+# Make pcredemo.3 from the pcredemo.c source file
+
+echo "Making pcredemo.3"
+perl <<"END" >pcredemo.3
+ open(IN, "../pcredemo.c") || die "Failed to open pcredemo.c\n";
+ open(OUT, ">pcredemo.3") || die "Failed to open pcredemo.3\n";
+ print OUT ".\\\" Start example.\n" .
+ ".de EX\n" .
+ ". nr mE \\\\n(.f\n" .
+ ". nf\n" .
+ ". nh\n" .
+ ". ft CW\n" .
+ "..\n" .
+ ".\n" .
+ ".\n" .
+ ".\\\" End example.\n" .
+ ".de EE\n" .
+ ". ft \\\\n(mE\n" .
+ ". fi\n" .
+ ". hy \\\\n(HY\n" .
+ "..\n" .
+ ".\n" .
+ ".EX\n" ;
+ while (<IN>)
+ {
+ s/\\/\\e/g;
+ print OUT;
+ }
+ print OUT ".EE\n";
+ close(IN);
+ close(OUT);
+END
+if [ $? != 0 ] ; then exit 1; fi
+
+
# Make HTML form of the documentation.
echo "Making HTML documentation"
@@ -83,6 +120,7 @@
# Exclude table of contents for function summaries. It seems that expr
# forces an anchored regex. Also exclude them for small pages that have
# only one section.
+
for file in *.3 ; do
base=`basename $file .3`
toc=-toc
@@ -98,10 +136,11 @@
if [ $? != 0 ] ; then exit 1; fi
done
-# End of documentation processing
+# End of documentation processing; stop if only documentation required.
cd ..
echo Documentation done
+if [ "$1" = "doc" ] ; then exit; fi
# These files are detrailed; do not detrail the test data because there may be
# significant trailing spaces. The configure files are also omitted from the
@@ -128,6 +167,7 @@
RunTest.bat \
pcre-config.in \
libpcre.pc.in \
+ libpcreposix.pc.in \
libpcrecpp.pc.in \
config.h.in \
pcre_printint.src \
Modified: trunk/Externals/pcre/README
===================================================================
--- trunk/Externals/pcre/README 2009-12-29 14:22:46 UTC (rev 7067)
+++ trunk/Externals/pcre/README 2009-12-29 18:22:40 UTC (rev 7068)
@@ -24,6 +24,7 @@
Shared libraries on Unix-like systems
Cross-compiling on Unix-like systems
Using HP's ANSI C++ compiler (aCC)
+ Using PCRE from MySQL
Making new tarballs
Testing PCRE
Character tables
@@ -111,8 +112,8 @@
For a non-Unix system, please read the comments in the file NON-UNIX-USE,
though if your system supports the use of "configure" and "make" you may be
able to build PCRE in the same way as for Unix-like systems. PCRE can also be
-configured in many platform environments using the GUI facility of CMake's
-CMakeSetup. It creates Makefiles, solution files, etc.
+configured in many platform environments using the GUI facility provided by
+CMake's cmake-gui command. This creates Makefiles, solution files, etc.
PCRE has been compiled on many different operating systems. It should be
straightforward to build PCRE on any system that has a Standard C compiler and
@@ -478,6 +479,26 @@
CXXLDFLAGS="-lstd_v2 -lCsup_v2"
+Using Sun's compilers for Solaris
+---------------------------------
+
+A user reports that the following configurations work on Solaris 9 sparcv9 and
+Solaris 9 x86 (32-bit):
+
+ Solaris 9 sparcv9: ./configure --disable-cpp CC=/bin/cc CFLAGS="-m64 -g"
+ Solaris 9 x86: ./configure --disable-cpp CC=/bin/cc CFLAGS="-g"
+
+
+Using PCRE from MySQL
+---------------------
+
+On systems where both PCRE and MySQL are installed, it is possible to make use
+of PCRE from within MySQL, as an alternative to the built-in pattern matching.
+There is a web page that tells you how to do this:
+
+ http://www.mysqludf.org/lib_mysqludf_preg/index.php
+
+
Making new tarballs
-------------------
@@ -553,23 +574,33 @@
The fourth test checks the UTF-8 support. It is not run automatically unless
PCRE is built with UTF-8 support. To do this you must set --enable-utf8 when
-running "configure". This file can be also fed directly to the perltest script,
-provided you are running Perl 5.8 or higher. (For Perl 5.6, a small patch,
-commented in the script, can be be used.)
+running "configure". This file can be also fed directly to the perltest.pl
+script, provided you are running Perl 5.8 or higher.
The fifth test checks error handling with UTF-8 encoding, and internal UTF-8
features of PCRE that are not relevant to Perl.
-The sixth test checks the support for Unicode character properties. It it not
-run automatically unless PCRE is built with Unicode property support. To to
-this you must set --enable-unicode-properties when running "configure".
+The sixth test (which is Perl-5.10 compatible) checks the support for Unicode
+character properties. It it not run automatically unless PCRE is built with
+Unicode property support. To to this you must set --enable-unicode-properties
+when running "configure".
The seventh, eighth, and ninth tests check the pcre_dfa_exec() alternative
matching function, in non-UTF-8 mode, UTF-8 mode, and UTF-8 mode with Unicode
property support, respectively. The eighth and ninth tests are not run
automatically unless PCRE is build with the relevant support.
+The tenth test checks some internal offsets and code size features; it is run
+only when the default "link size" of 2 is set (in other cases the sizes
+change).
+The eleventh test checks out features that are new in Perl 5.10, and the
+twelfth test checks a number internals and non-Perl features concerned with
+Unicode property support. It it not run automatically unless PCRE is built with
+Unicode property support. To to this you must set --enable-unicode-properties
+when running "configure".
+
+
Character tables
----------------
@@ -712,7 +743,7 @@
) "configure" and config.h
depcomp ) script to find program dependencies, generated by
) automake
- doc/*.3 man page sources for the PCRE functions
+ doc/*.3 man page sources for PCRE
doc/*.1 man page sources for pcregrep and pcretest
doc/index.html.src the base HTML page
doc/html/* HTML documentation
@@ -721,6 +752,7 @@
doc/perltest.txt plain text documentation of Perl test program
install-sh a shell script for installing files
libpcre.pc.in template for libpcre.pc for pkg-config
+ libpcreposix.pc.in template for libpcreposix.pc for pkg-config
libpcrecpp.pc.in template for libpcrecpp.pc for pkg-config
ltmain.sh file used to build a libtool script
missing ) common stub for a few missing GNU programs while
@@ -764,4 +796,4 @@
Philip Hazel
Email local part: ph10
Email domain: cam.ac.uk
-Last updated: 21 March 2009
+Last updated: 19 October 2009
Modified: trunk/Externals/pcre/RunGrepTest
===================================================================
--- trunk/Externals/pcre/RunGrepTest 2009-12-29 14:22:46 UTC (rev 7067)
+++ trunk/Externals/pcre/RunGrepTest 2009-12-29 18:22:40 UTC (rev 7068)
@@ -14,9 +14,7 @@
echo "Testing pcregrep"
$pcregrep -V
-cf="diff -ub"
valgrind=
-
while [ $# -gt 0 ] ; do
case $1 in
valgrind) valgrind="valgrind -q --leak-check=no";;
@@ -25,6 +23,18 @@
shift
done
+cf="diff -ub"
+
+# Set up a suitable "diff" command for comparison. Some systems have a diff
+# that lacks a -u option. Try to deal with this; better do the test for the -b
+# option as well.
+
+if diff -u /dev/null /dev/null; then
+ if diff -ub /dev/null /dev/null; then cf="diff -ub"; else cf="diff -u"; fi
+else
+ if diff -b /dev/null /dev/null; then cf="diff -b"; else cf="diff"; fi
+fi
+
# If PCRE has been built in a directory other than the source directory, and
# this test is being run from "make check" as usual, then $(srcdir) will be
# set. If not, set it to the current directory. We then arrange to run the
@@ -179,13 +189,13 @@
(cd $srcdir; $valgrind $pcregrep -on 'before|zero|after' ./testdata/grepinput) >>testtry
echo "---------------------------- Test 43 ------------------------------" >>testtry
-(cd $srcdir; $valgrind $pcregrep -on -e before -e zero -e after ./testdata/grepinput) >>testtry
+(cd $srcdir; $valgrind $pcregrep -on -e before -ezero -e after ./testdata/grepinput) >>testtry
echo "---------------------------- Test 44 ------------------------------" >>testtry
(cd $srcdir; $valgrind $pcregrep -on -f ./testdata/greplist -e binary ./testdata/grepinput) >>testtry
echo "---------------------------- Test 45 ------------------------------" >>testtry
-(cd $srcdir; $valgrind $pcregrep -e abc -e '(unclosed' ./testdata/grepinput) 2>>testtry >>testtry
+(cd $srcdir; $valgrind $pcregrep -eabc -e '(unclosed' ./testdata/grepinput) 2>>testtry >>testtry
echo "---------------------------- Test 46 ------------------------------" >>testtry
(cd $srcdir; $valgrind $pcregrep -Fx "AB.VE
@@ -217,6 +227,24 @@
echo "---------------------------- Test 54 -----------------------------" >>testtry
(cd $srcdir; $valgrind $pcregrep -f./testdata/greplist --color=always ./testdata/grepinputx) >>testtry
+echo "---------------------------- Test 55 -----------------------------" >>testtry
+(cd $srcdir; $valgrind $pcregrep -c lazy ./testdata/grepinput*) >>testtry
+
+echo "---------------------------- Test 56 -----------------------------" >>testtry
+(cd $srcdir; $valgrind $pcregrep -c -l lazy ./testdata/grepinput*) >>testtry
+
+echo "---------------------------- Test 57 -----------------------------" >>testtry
+(cd $srcdir; $valgrind $pcregrep --regex=PATTERN ./testdata/grepinput) >>testtry
+
+echo "---------------------------- Test 58 -----------------------------" >>testtry
+(cd $srcdir; $valgrind $pcregrep --regexp=PATTERN ./testdata/grepinput) >>testtry
+
+echo "---------------------------- Test 59 -----------------------------" >>testtry
+(cd $srcdir; $valgrind $pcregrep --regex PATTERN ./testdata/grepinput) >>testtry
+
+echo "---------------------------- Test 60 -----------------------------" >>testtry
+(cd $srcdir; $valgrind $pcregrep --regexp PATTERN ./testdata/grepinput) >>testtry
+
# Now compare the results.
$cf $srcdir/testdata/grepoutput testtry
Modified: trunk/Externals/pcre/RunTest
===================================================================
--- trunk/Externals/pcre/RunTest 2009-12-29 14:22:46 UTC (rev 7067)
+++ trunk/Externals/pcre/RunTest 2009-12-29 18:22:40 UTC (rev 7068)
@@ -44,6 +44,8 @@
do8=no
do9=no
do10=no
+do11=no
+do12=no
while [ $# -gt 0 ] ; do
case $1 in
@@ -57,6 +59,8 @@
8) do8=yes;;
9) do9=yes;;
10) do10=yes;;
+ 11) do11=yes;;
+ 12) do12=yes;;
valgrind) valgrind="valgrind -q";;
*) echo "Unknown test number $1"; exit 1;;
esac
@@ -91,6 +95,10 @@
echo "Can't run test 10 because Unicode property support is not configured"
exit 1
fi
+ if [ $do12 = yes ] ; then
+ echo "Can't run test 12 because Unicode property support is not configured"
+ exit 1
+ fi
fi
if [ $link_size -ne 2 ] ; then
@@ -104,7 +112,7 @@
if [ $do1 = no -a $do2 = no -a $do3 = no -a $do4 = no -a \
$do5 = no -a $do6 = no -a $do7 = no -a $do8 = no -a \
- $do9 = no -a $do10 = no ] ; then
+ $do9 = no -a $do10 = no -a $do11 = no -a $do12 = no ] ; then
do1=yes
do2=yes
do3=yes
@@ -115,6 +123,8 @@
if [ $utf8 -ne 0 ] ; then do8=yes; fi
if [ $utf8 -ne 0 -a $ucp -ne 0 ] ; then do9=yes; fi
if [ $link_size -eq 2 -a $ucp -ne 0 ] ; then do10=yes; fi
+ do11=yes
+ if [ $utf8 -ne 0 -a $ucp -ne 0 ] ; then do12=yes; fi
fi
# Show which release
@@ -123,10 +133,10 @@
echo PCRE C library tests
./pcretest /dev/null
-# Primary test, Perl-compatible
+# Primary test, Perl-compatible for both 5.8 and 5.10
if [ $do1 = yes ] ; then
- echo "Test 1: main functionality (Perl compatible)"
+ echo "Test 1: main functionality (Perl 5.8 & 5.10 compatible)"
$valgrind ./pcretest -q $testdata/testinput1 testtry
if [ $? = 0 ] ; then
$cf $testdata/testoutput1 testtry
@@ -136,10 +146,10 @@
echo "OK"
fi
-# PCRE tests that are not Perl-compatible - API & error tests, mostly
+# PCRE tests that are not Perl-compatible - API, errors, internals
if [ $do2 = yes ] ; then
- echo "Test 2: API and error handling (not Perl compatible)"
+ echo "Test 2: API, errors, internals, and non-Perl stuff"
$valgrind ./pcretest -q $testdata/testinput2 testtry
if [ $? = 0 ] ; then
$cf $testdata/testoutput2 testtry
@@ -205,7 +215,7 @@
# Additional tests for UTF8 support
if [ $do4 = yes ] ; then
- echo "Test 4: UTF-8 support (Perl compatible)"
+ echo "Test 4: UTF-8 support (Perl 5.8 & 5.10 compatible)"
$valgrind ./pcretest -q $testdata/testinput4 testtry
if [ $? = 0 ] ; then
$cf $testdata/testoutput4 testtry
@@ -216,7 +226,7 @@
fi
if [ $do5 = yes ] ; then
- echo "Test 5: API and internals for UTF-8 support (not Perl compatible)"
+ echo "Test 5: API, internals, and non-Perl stuff for UTF-8 support"
$valgrind ./pcretest -q $testdata/testinput5 testtry
if [ $? = 0 ] ; then
$cf $testdata/testoutput5 testtry
@@ -227,7 +237,7 @@
fi
if [ $do6 = yes ] ; then
- echo "Test 6: Unicode property support"
+ echo "Test 6: Unicode property support (Perl 5.10 compatible)"
$valgrind ./pcretest -q $testdata/testinput6 testtry
if [ $? = 0 ] ; then
$cf $testdata/testoutput6 testtry
@@ -289,4 +299,30 @@
echo "OK"
fi
+# Test of Perl 5.10 features
+
+if [ $do11 = yes ] ; then
+ echo "Test 11: Perl 5.10 features"
+ $valgrind ./pcretest -q $testdata/testinput11 testtry
+ if [ $? = 0 ] ; then
+ $cf $testdata/testoutput11 testtry
+ if [ $? != 0 ] ; then exit 1; fi
+ else exit 1
+ fi
+ echo "OK"
+fi
+
+# Test non-Perl-compatible Unicode property support
+
+if [ $do12 = yes ] ; then
+ echo "Test 12: API, internals, and non-Perl stuff for Unicode property support"
+ $valgrind ./pcretest -q $testdata/testinput12 testtry
+ if [ $? = 0 ] ; then
+ $cf $testdata/testoutput12 testtry
+ if [ $? != 0 ] ; then exit 1; fi
+ else exit 1
+ fi
+ echo "OK"
+fi
+
# End
Modified: trunk/Externals/pcre/RunTest.bat
===================================================================
--- trunk/Externals/pcre/RunTest.bat 2009-12-29 14:22:46 UTC (rev 7067)
+++ trunk/Externals/pcre/RunTest.bat 2009-12-29 18:22:40 UTC (rev 7068)
@@ -1,5 +1,5 @@
@rem This file was contributed by Ralf Junker, and touched up by
-@rem Daniel Richard G. Test 10 added by Philip H.
+@rem Daniel Richard G. Tests 10-12 added by Philip H.
@rem Philip H also changed test 3 to use "wintest" files.
@rem
@rem MS Windows batch file to run pcretest on testfiles with the correct
@@ -25,6 +25,8 @@
%pcretest% -q -dfa %srcdir%\testdata\testinput8 > testout\testoutput8
%pcretest% -q -dfa %srcdir%\testdata\testinput9 > testout\testoutput9
%pcretest% -q %srcdir%\testdata\testinput10 > testout\testoutput10
+%pcretest% -q %srcdir%\testdata\testinput11 > testout\testoutput11
+%pcretest% -q %srcdir%\testdata\testinput12 > testout\testoutput12
fc /n %srcdir%\testdata\testoutput1 testout\testoutput1
fc /n %srcdir%\testdata\testoutput2 testout\testoutput2
@@ -37,3 +39,5 @@
fc /n %srcdir%\testdata\testoutput8 testout\testoutput8
fc /n %srcdir%\testdata\testoutput9 testout\testoutput9
fc /n %srcdir%\testdata\testoutput10 testout\testoutput10
+fc /n %srcdir%\testdata\testoutput11 testout\testoutput11
+fc /n %srcdir%\testdata\testoutput12 testout\testoutput12
Modified: trunk/Externals/pcre/Win32/ALL_BUILD.vcproj
===================================================================
--- trunk/Externals/pcre/Win32/ALL_BUILD.vcproj 2009-12-29 14:22:46 UTC (rev 7067)
+++ trunk/Externals/pcre/Win32/ALL_BUILD.vcproj 2009-12-29 18:22:40 UTC (rev 7068)
@@ -1,11 +1,9 @@
-<?xml version="1.0" encoding="Windows-1252"?>
+<?xml version="1.0" encoding = "Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="7.10"
+ Version="8.00"
Name="ALL_BUILD"
- ProjectGUID="{A0E541DB-A9FD-4A27-AC5C-C542673083E3}"
- SccProjectName=""
- SccLocalPath=""
+ ProjectGUID="{8EA48733-5246-4479-AC13-94A899A510BF}"
Keyword="Win32Proj">
<Platforms>
<Platform
@@ -14,15 +12,27 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="..\..\..\Build\pcre\Debug"
- IntermediateDirectory="..\..\..\BuildTmp\pcre\ALL_BUILD.dir\Debug"
+ OutputDirectory="Debug"
+ IntermediateDirectory="ALL_BUILD.dir\Debug"
ConfigurationType="10"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="2">
<Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win32;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre;"
+ ExceptionHandling="0"
+ PreprocessorDefinitions="HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"Debug\""
+ AssemblerListingLocation="Debug"
+ ObjectFile="$(IntDir)\"
+/>
+ <Tool
Name="VCCustomBuildTool"/>
<Tool
+ Name="VCResourceCompilerTool"
+ AdditionalIncludeDirectories="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win32;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre;"
+ PreprocessorDefinitions="HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"Debug\""/>
+ <Tool
Name="VCMIDLTool"
PreprocessorDefinitions="HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"Debug\""
MkTypLibCompatible="FALSE"
@@ -35,21 +45,35 @@
InterfaceIdentifierFileName="$(InputName)_i.c"
ProxyFileName="$(InputName)_p.c"/>
<Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="..\..\..\Build\pcre\Release"
- IntermediateDirectory="..\..\..\Build\pcre\ALL_BUILD.dir\Release"
+ OutputDirectory="Release"
+ IntermediateDirectory="ALL_BUILD.dir\Release"
ConfigurationType="10"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="2">
<Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win32;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre;"
+ ExceptionHandling="0"
+ PreprocessorDefinitions="HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"Release\""
+ AssemblerListingLocation="Release"
+ ObjectFile="$(IntDir)\"
+/>
+ <Tool
Name="VCCustomBuildTool"/>
<Tool
+ Name="VCResourceCompilerTool"
+ AdditionalIncludeDirectories="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win32;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre;"
+ PreprocessorDefinitions="HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"Release\""/>
+ <Tool
Name="VCMIDLTool"
PreprocessorDefinitions="HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"Release\""
MkTypLibCompatible="FALSE"
@@ -62,21 +86,35 @@
InterfaceIdentifierFileName="$(InputName)_i.c"
ProxyFileName="$(InputName)_p.c"/>
<Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
</Configuration>
<Configuration
Name="MinSizeRel|Win32"
- OutputDirectory="..\..\..\Build\pcre\MinSizeRel"
- IntermediateDirectory="..\..\..\BuildTmp\pcre\ALL_BUILD.dir\MinSizeRel"
+ OutputDirectory="MinSizeRel"
+ IntermediateDirectory="ALL_BUILD.dir\MinSizeRel"
ConfigurationType="10"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="2">
<Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win32;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre;"
+ ExceptionHandling="0"
+ PreprocessorDefinitions="HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"MinSizeRel\""
+ AssemblerListingLocation="MinSizeRel"
+ ObjectFile="$(IntDir)\"
+/>
+ <Tool
Name="VCCustomBuildTool"/>
<Tool
+ Name="VCResourceCompilerTool"
+ AdditionalIncludeDirectories="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win32;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre;"
+ PreprocessorDefinitions="HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"MinSizeRel\""/>
+ <Tool
Name="VCMIDLTool"
PreprocessorDefinitions="HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"MinSizeRel\""
MkTypLibCompatible="FALSE"
@@ -89,21 +127,35 @@
InterfaceIdentifierFileName="$(InputName)_i.c"
ProxyFileName="$(InputName)_p.c"/>
<Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
</Configuration>
<Configuration
Name="RelWithDebInfo|Win32"
- OutputDirectory="..\..\..\Build\pcre\RelWithDebInfo"
- IntermediateDirectory="..\..\..\Build\pcre\ALL_BUILD.dir\RelWithDebInfo"
+ OutputDirectory="RelWithDebInfo"
+ IntermediateDirectory="ALL_BUILD.dir\RelWithDebInfo"
ConfigurationType="10"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="2">
<Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win32;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre;"
+ ExceptionHandling="0"
+ PreprocessorDefinitions="HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"RelWithDebInfo\""
+ AssemblerListingLocation="RelWithDebInfo"
+ ObjectFile="$(IntDir)\"
+/>
+ <Tool
Name="VCCustomBuildTool"/>
<Tool
+ Name="VCResourceCompilerTool"
+ AdditionalIncludeDirectories="D:\Work\WinMerge\WinMerge_SVN\Externals\pcre\Win32;D:\Work\WinMerge\WinMerge_SVN\Externals\pcre;"
+ PreprocessorDefinitions="HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"RelWithDebInfo\""/>
+ <Tool
Name="VCMIDLTool"
PreprocessorDefinitions="HAVE_CONFIG_H,_CRT_SECURE_NO_DEPRECATE,CMAKE_INTDIR=\"RelWithDebInfo\""
MkTypLibCompatible="FALSE"
@@ -116,99 +168,99 @@
InterfaceIdentifierFileName="$(InputName)_i.c"
ProxyFileName="$(InputName)_p.c"/>
<Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
</Configuration>
</Configurations>
- <References>
- </References>
<Files>
- <Filter
- Name="CMake Rules"
- Filter="">
<File
- ...
[truncated message content] |
