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: <jt...@us...> - 2010-11-01 11:39:46
|
Revision: 7394
http://winmerge.svn.sourceforge.net/winmerge/?rev=7394&view=rev
Author: jtuc
Date: 2010-11-01 11:39:37 +0000 (Mon, 01 Nov 2010)
Log Message:
-----------
Add Merge7z*.vcxproj files 915 through 917
Added Paths:
-----------
trunk/ArchiveSupport/Merge7z/Merge7z915.vcxproj
trunk/ArchiveSupport/Merge7z/Merge7z915.vcxproj.filters
trunk/ArchiveSupport/Merge7z/Merge7z916.vcxproj
trunk/ArchiveSupport/Merge7z/Merge7z916.vcxproj.filters
trunk/ArchiveSupport/Merge7z/Merge7z917.vcxproj
trunk/ArchiveSupport/Merge7z/Merge7z917.vcxproj.filters
Added: trunk/ArchiveSupport/Merge7z/Merge7z915.vcxproj
===================================================================
--- trunk/ArchiveSupport/Merge7z/Merge7z915.vcxproj (rev 0)
+++ trunk/ArchiveSupport/Merge7z/Merge7z915.vcxproj 2010-11-01 11:39:37 UTC (rev 7394)
@@ -0,0 +1,1216 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="UnicodeDebug|Win32">
+ <Configuration>UnicodeDebug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="UnicodeRelease|Win32">
+ <Configuration>UnicodeRelease</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{674B6EE4-21FE-4FD4-885D-9AAA145D1D50}</ProjectGuid>
+ <SccProjectName />
+ <SccLocalPath />
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">.\..\BuildTmp\Merge7z915___Win32_UnicodeDebug\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">.\..\BuildTmp\Merge7z915___Win32_UnicodeDebug\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">false</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">.\..\BuildTmp\Merge7z915___Win32_UnicodeRelease\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">.\..\BuildTmp\Merge7z915___Win32_UnicodeRelease\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">false</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\BuildTmp\Merge7z915___Win32_Release\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\BuildTmp\Merge7z915___Win32_Release\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\BuildTmp\Merge7z915___Win32_Debug\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\BuildTmp\Merge7z915___Win32_Debug\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>$(SRC7Z)\7z915;$(SRC7Z)\7z915\CPP;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>Merge7z915_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ <PrecompiledHeader>Use</PrecompiledHeader>
+ <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
+ <PrecompiledHeaderOutputFile>.\..\BuildTmp\Merge7z915___Win32_UnicodeDebug/Merge7z915.pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>.\..\BuildTmp\Merge7z915___Win32_UnicodeDebug/</AssemblerListingLocation>
+ <ObjectFileName>.\..\BuildTmp\Merge7z915___Win32_UnicodeDebug/</ObjectFileName>
+ <ProgramDataBaseFileName>.\..\BuildTmp\Merge7z915___Win32_UnicodeDebug/</ProgramDataBaseFileName>
+ <BrowseInformation>true</BrowseInformation>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>OldStyle</DebugInformationFormat>
+ <CompileAs>Default</CompileAs>
+ <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>shlwapi.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>../../Build/MergeUnicodeDebug/Merge7z915U.dll</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>.\Merge7z.def</ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>../../Build/MergeUnicodeDebug/Merge7z915U.pdb</ProgramDatabaseFile>
+ <ImportLibrary>.\..\BuildTmp\Merge7z915___Win32_UnicodeDebug/Merge7z915U.lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\..\BuildTmp\Merge7z915___Win32_UnicodeDebug/Merge7z915.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0407</Culture>
+ </ResourceCompile>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">
+ <ClCompile>
+ <Optimization>MinSpace</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>$(SRC7Z)\7z915\CPP;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>Merge7z915_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeader>Use</PrecompiledHeader>
+ <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
+ <PrecompiledHeaderOutputFile>.\..\BuildTmp\Merge7z915___Win32_UnicodeRelease/Merge7z915.pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>.\..\BuildTmp\Merge7z915___Win32_UnicodeRelease/</AssemblerListingLocation>
+ <ObjectFileName>.\..\BuildTmp\Merge7z915___Win32_UnicodeRelease/</ObjectFileName>
+ <ProgramDataBaseFileName>.\..\BuildTmp\Merge7z915___Win32_UnicodeRelease/</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <CompileAs>Default</CompileAs>
+ <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>shlwapi.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>../../Build/MergeUnicodeRelease/Merge7z915U.dll</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>.\Merge7z.def</ModuleDefinitionFile>
+ <ImportLibrary>.\..\BuildTmp\Merge7z915___Win32_UnicodeRelease/Merge7z915U.lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\..\BuildTmp\Merge7z915___Win32_UnicodeRelease/Merge7z915.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0407</Culture>
+ </ResourceCompile>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <Optimization>MinSpace</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>$(SRC7Z)\7z915;$(SRC7Z)\7z915\CPP;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;Merge7z915_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeader>Use</PrecompiledHeader>
+ <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
+ <PrecompiledHeaderOutputFile>.\..\BuildTmp\Merge7z915___Win32_Release/Merge7z915.pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>.\..\BuildTmp\Merge7z915___Win32_Release/</AssemblerListingLocation>
+ <ObjectFileName>.\..\BuildTmp\Merge7z915___Win32_Release/</ObjectFileName>
+ <ProgramDataBaseFileName>.\..\BuildTmp\Merge7z915___Win32_Release/</ProgramDataBaseFileName>
+ <BrowseInformation>true</BrowseInformation>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <CompileAs>Default</CompileAs>
+ <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>shlwapi.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>../../Build/MergeRelease/Merge7z915.dll</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>.\Merge7z.def</ModuleDefinitionFile>
+ <ImportLibrary>.\..\BuildTmp\Merge7z915___Win32_Release/Merge7z915.lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\..\BuildTmp\Merge7z915___Win32_Release/Merge7z915.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0407</Culture>
+ </ResourceCompile>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>$(SRC7Z)\7z915;$(SRC7Z)\7z915\CPP;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;Merge7z915_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ <PrecompiledHeader>Use</PrecompiledHeader>
+ <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
+ <PrecompiledHeaderOutputFile>.\..\BuildTmp\Merge7z915___Win32_Debug/Merge7z915.pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>.\..\BuildTmp\Merge7z915___Win32_Debug/</AssemblerListingLocation>
+ <ObjectFileName>.\..\BuildTmp\Merge7z915___Win32_Debug/</ObjectFileName>
+ <ProgramDataBaseFileName>.\..\BuildTmp\Merge7z915___Win32_Debug/</ProgramDataBaseFileName>
+ <BrowseInformation>true</BrowseInformation>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>OldStyle</DebugInformationFormat>
+ <CompileAs>Default</CompileAs>
+ <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>shlwapi.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>../../Build/MergeDebug/Merge7z915.dll</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>.\Merge7z.def</ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>../../Build/MergeDebug/Merge7z915.pdb</ProgramDatabaseFile>
+ <ImportLibrary>.\..\BuildTmp\Merge7z915___Win32_Debug/Merge7z915.lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\..\BuildTmp\Merge7z915___Win32_Debug/Merge7z915.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0407</Culture>
+ </ResourceCompile>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <None Include="Merge7z.def" />
+ <None Include="$(SRC7Z)\7z915\CPP\7zip\Ui\Gui\FM.ico" />
+ <None Include="revision.txt" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\..\..\7z915\C\CpuArch.h" />
+ <ClInclude Include="Merge7z.h" />
+ <ClInclude Include="Merge7zCommon.h" />
+ <ClInclude Include="StdAfx.h" />
+ <ClInclude Include="tools.h" />
+ <ClInclude Include="$(SRC7Z)\7z915\CPP\7zip\UI\GUI\resource.h" />
+ <ClInclude Include="$(SRC7Z)\7z915\CPP\Windows\DLL.h" />
+ <ClInclude Include="$(SRC7Z)\7z915\CPP\Windows\Error.h" />
+ <ClInclude Include="$(SRC7Z)\7z915\CPP\Windows\FileIO.h" />
+ <ClInclude Include="..\..\..\..\7z915\Cpp\Windows\Control\ListView.h" />
+ <ClInclude Include="$(SRC7Z)\7z915\CPP\Windows\PropVariant.h" />
+ <ClInclude Include="$(SRC7Z)\7z915\CPP\Windows\PropVariantConversions.h" />
+ <ClInclude Include="$(SRC7Z)\7z915\CPP\Windows\ResourceString.h" />
+ <ClInclude Include="$(SRC7Z)\7z915\CPP\Windows\Synchronization.h" />
+ <ClInclude Include="$(SRC7Z)\7z915\CPP\Common\IntToString.h" />
+ <ClInclude Include="$(SRC7Z)\7z915\CPP\Common\Lang.h" />
+ <ClInclude Include="$(SRC7Z)\7z915\CPP\Common\MyString.h" />
+ <ClInclude Include="..\..\..\..\7z915\Cpp\7zip\Archive\Common\OutStreamWithCRC.h" />
+ <ClInclude Include="$(SRC7Z)\7z915\CPP\Common\StringConvert.h" />
+ <ClInclude Include="$(SRC7Z)\7z915\CPP\Common\StringToInt.h" />
+ <ClInclude Include="$(SRC7Z)\7z915\CPP\Common\TextConfig.h" />
+ <ClInclude Include="$(SRC7Z)\7z915\CPP\Common\UTFConvert.h" />
+ <ClInclude Include="$(SRC7Z)\7z915\CPP\7zip\UI\Common\ArchiveExtractCallback.h" />
+ <ClInclude Include="$(SRC7Z)\7z915\CPP\7zip\UI\Common\ArchiveOpenCallback.h" />
+ <ClInclude Include="$(SRC7Z)\7z915\CPP\7zip\UI\Common\DefaultName.h" />
+ <ClInclude Include="$(SRC7Z)\7z915\CPP\Windows\Control\Dialog.h" />
+ <ClInclude Include="..\..\..\..\7z915\Cpp\7zip\Ui\Common\EnumDirItems.h" />
+ <ClInclude Include="$(SRC7Z)\7z915\CPP\7zip\UI\FileManager\ExtractCallback.h" />
+ <ClInclude Include="$(SRC7Z)\7z915\CPP\7zip\Common\FileStreams.h" />
+ <ClInclude Include="$(SRC7Z)\7z915\CPP\7zip\UI\FileManager\FormatUtils.h" />
+ <ClInclude Include="$(SRC7Z)\7z915\CPP\7zip\UI\FileManager\LangUtils.h" />
+ <ClInclude Include="..\..\..\..\7z915\Cpp\7zip\Ui\Common\LoadCodecs.h" />
+ <ClInclude Include="$(SRC7Z)\7z915\CPP\7zip\UI\FileManager\MessagesDialog.h" />
+ <ClInclude Include="$(SRC7Z)\7z915\CPP\7zip\UI\Common\OpenArchive.h" />
+ <ClInclude Include="$(SRC7Z)\7z915\CPP\7zip\UI\FileManager\OpenCallback.h" />
+ <ClInclude Include="$(SRC7Z)\7z915\CPP\7zip\UI\FileManager\OverwriteDialog.h" />
+ <ClInclude Include="$(SRC7Z)\7z915\CPP\7zip\UI\FileManager\PasswordDialog.h" />
+ <ClInclude Include="$(SRC7Z)\7z915\CPP\7zip\UI\FileManager\ProgramLocation.h" />
+ <ClInclude Include="$(SRC7Z)\7z915\CPP\7zip\Common\ProgressUtils.h" />
+ <ClInclude Include="$(SRC7Z)\7z915\CPP\7zip\Common\StreamUtils.h" />
+ <ClInclude Include="$(SRC7Z)\7z915\CPP\7zip\UI\Common\UpdateCallback.h" />
+ <ClInclude Include="$(SRC7Z)\7z915\CPP\7zip\UI\GUI\UpdateCallbackGUI.h" />
+ <ClInclude Include="$(SRC7Z)\7z915\CPP\Windows\Window.h" />
+ <ClInclude Include="$(SRC7Z)\7z915\CPP\7zip\UI\Common\ExtractingFilePath.h" />
+ <ClInclude Include="$(SRC7Z)\7z915\CPP\Windows\FileDir.h" />
+ <ClInclude Include="$(SRC7Z)\7z915\CPP\Windows\FileFind.h" />
+ <ClInclude Include="$(SRC7Z)\7z915\CPP\Windows\FileName.h" />
+ <ClInclude Include="$(SRC7Z)\7z915\CPP\7zip\Common\FilePathAutoRename.h" />
+ <ClInclude Include="$(SRC7Z)\7z915\CPP\Common\MyVector.h" />
+ <ClInclude Include="$(SRC7Z)\7z915\CPP\Common\Wildcard.h" />
+ <ClInclude Include="..\..\..\..\7z915\C\7zCrc.h" />
+ <ClInclude Include="..\..\..\..\7z915\C\Threads.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\..\..\7z915\C\7zCrcOpt.c">
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">NotUsing</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">NotUsing</PrecompiledHeader>
+ </ClCompile>
+ <ClCompile Include="..\..\..\..\7z915\C\CpuArch.c">
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">NotUsing</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">NotUsing</PrecompiledHeader>
+ </ClCompile>
+ <ClCompile Include="Merge7z907.cpp" />
+ <ClCompile Include="Merge7zCommon.cpp">
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7z915_EXPORTS</PreprocessorDefinitions>
+ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+ <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MinSpace</Optimization>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7z915_EXPORTS</PreprocessorDefinitions>
+ <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</BrowseInformation>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Disabled</Optimization>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Merge7z915_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE</PreprocessorDefinitions>
+ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+ <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">true</BrowseInformation>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">MinSpace</Optimization>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">Merge7z915_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="StdAfx.cpp">
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7z915_EXPORTS</PreprocessorDefinitions>
+ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+ <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MinSpace</Optimization>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7z915_EXPORTS</PreprocessorDefinitions>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+ <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</BrowseInformation>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Disabled</Optimization>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Merge7z915_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE</PreprocessorDefinitions>
+ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Create</PrecompiledHeader>
+ <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">true</BrowseInformation>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">MinSpace</Optimization>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">Merge7z915_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE</PreprocessorDefinitions>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">Create</PrecompiledHeader>
+ </ClCompile>
+ <ClCompile Include="tools.cpp">
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7z915_EXPORTS</PreprocessorDefinitions>
+ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+ <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MinSpace</Optimization>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7z915_EXPORTS</PreprocessorDefinitions>
+ <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</BrowseInformation>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Disabled</Optimization>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Merge7z915_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE</PreprocessorDefinitions>
+ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+ <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">true</BrowseInformation>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">MinSpace</Optimization>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">Merge7z915_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="$(SRC7Z)\7z915\CPP\Windows\DLL.cpp">
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7z915_EXPORTS</PreprocessorDefinitions>
+ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+ <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MinSpace</Optimization>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7z915_EXPORTS</PreprocessorDefinitions>
+ <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</BrowseInformation>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Disabled</Optimization>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Merge7z915_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE</PreprocessorDefinitions>
+ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+ <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">true</BrowseInformation>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">MinSpace</Optimization>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">Merge7z915_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="$(SRC7Z)\7z915\CPP\Windows\Error.cpp">
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7z915_EXPORTS</PreprocessorDefinitions>
+ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+ <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MinSpace</Optimization>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7z915_EXPORTS</PreprocessorDefinitions>
+ <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</BrowseInformation>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Disabled</Optimization>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Merge7z915_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE</PreprocessorDefinitions>
+ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+ <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">true</BrowseInformation>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">MinSpace</Optimization>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">Merge7z915_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="$(SRC7Z)\7z915\CPP\Windows\FileIO.cpp">
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7z915_EXPORTS</PreprocessorDefinitions>
+ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+ <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MinSpace</Optimization>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7z915_EXPORTS</PreprocessorDefinitions>
+ <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</BrowseInformation>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Disabled</Optimization>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Merge7z915_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE</PreprocessorDefinitions>
+ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+ <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">true</BrowseInformation>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">MinSpace</Optimization>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">Merge7z915_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\..\..\7z915\Cpp\Windows\Control\ListView.cpp" />
+ <ClCompile Include="$(SRC7Z)\7z915\CPP\Windows\PropVariant.cpp">
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7z915_EXPORTS</PreprocessorDefinitions>
+ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+ <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MinSpace</Optimization>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7z915_EXPORTS</PreprocessorDefinitions>
+ <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</BrowseInformation>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Disabled</Optimization>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Merge7z915_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE</PreprocessorDefinitions>
+ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+ <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">true</BrowseInformation>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">MinSpace</Optimization>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">Merge7z915_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="$(SRC7Z)\7z915\CPP\Windows\PropVariantConversions.cpp">
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7z915_EXPORTS</PreprocessorDefinitions>
+ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+ <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MinSpace</Optimization>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7z915_EXPORTS</PreprocessorDefinitions>
+ <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</BrowseInformation>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Disabled</Optimization>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Merge7z915_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE</PreprocessorDefinitions>
+ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+ <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">true</BrowseInformation>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">MinSpace</Optimization>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">Merge7z915_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="$(SRC7Z)\7z915\CPP\Windows\ResourceString.cpp">
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7z915_EXPORTS</PreprocessorDefinitions>
+ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+ <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MinSpace</Optimization>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7z915_EXPORTS</PreprocessorDefinitions>
+ <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</BrowseInformation>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Disabled</Optimization>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Merge7z915_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE</PreprocessorDefinitions>
+ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+ <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">true</BrowseInformation>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">MinSpace</Optimization>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">Merge7z915_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="$(SRC7Z)\7z915\CPP\Windows\Synchronization.cpp">
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7z915_EXPORTS</PreprocessorDefinitions>
+ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+ <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MinSpace</Optimization>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7z915_EXPORTS</PreprocessorDefinitions>
+ <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</BrowseInformation>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Disabled</Optimization>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Merge7z915_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE</PreprocessorDefinitions>
+ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+ <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">true</BrowseInformation>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">MinSpace</Optimization>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">Merge7z915_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="$(SRC7Z)\7z915\CPP\Common\IntToString.cpp">
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7z915_EXPORTS</PreprocessorDefinitions>
+ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+ <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MinSpace</Optimization>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7z915_EXPORTS</PreprocessorDefinitions>
+ <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</BrowseInformation>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Disabled</Optimization>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Merge7z915_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE</PreprocessorDefinitions>
+ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+ <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">true</BrowseInformation>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">MinSpace</Optimization>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">Merge7z915_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="$(SRC7Z)\7z915\CPP\Common\Lang.cpp">
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7z915_EXPORTS</PreprocessorDefinitions>
+ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+ <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MinSpace</Optimization>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7z915_EXPORTS</PreprocessorDefinitions>
+ <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</BrowseInformation>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Disabled</Optimization>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Merge7z915_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE</PreprocessorDefinitions>
+ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+ <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">true</BrowseInformation>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">MinSpace</Optimization>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">Merge7z915_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="$(SRC7Z)\7z915\CPP\Common\MyString.cpp">
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7z915_EXPORTS</PreprocessorDefinitions>
+ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+ <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MinSpace</Optimization>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7z915_EXPORTS</PreprocessorDefinitions>
+ <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</BrowseInformation>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Disabled</Optimization>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Merge7z915_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE</PreprocessorDefinitions>
+ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+ <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">true</BrowseInformation>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">MinSpace</Optimization>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">Merge7z915_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\..\..\7z915\Cpp\7zip\Archive\Common\OutStreamWithCRC.cpp" />
+ <ClCompile Include="$(SRC7Z)\7z915\CPP\Common\StringConvert.cpp">
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7z915_EXPORTS</PreprocessorDefinitions>
+ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+ <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MinSpace</Optimization>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7z915_EXPORTS</PreprocessorDefinitions>
+ <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</BrowseInformation>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Disabled</Optimization>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Merge7z915_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE</PreprocessorDefinitions>
+ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+ <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">true</BrowseInformation>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">MinSpace</Optimization>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">Merge7z915_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="$(SRC7Z)\7z915\CPP\Common\StringToInt.cpp">
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7z915_EXPORTS</PreprocessorDefinitions>
+ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+ <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MinSpace</Optimization>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7z915_EXPORTS</PreprocessorDefinitions>
+ <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</BrowseInformation>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Disabled</Optimization>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Merge7z915_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE</PreprocessorDefinitions>
+ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+ <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">true</BrowseInformation>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">MinSpace</Optimization>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">Merge7z915_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="$(SRC7Z)\7z915\CPP\Common\TextConfig.cpp">
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7z915_EXPORTS</PreprocessorDefinitions>
+ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+ <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MinSpace</Optimization>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7z915_EXPORTS</PreprocessorDefinitions>
+ <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</BrowseInformation>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">Disabled</Optimization>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$...
[truncated message content] |
|
From: <jt...@us...> - 2010-11-01 09:57:16
|
Revision: 7393
http://winmerge.svn.sourceforge.net/winmerge/?rev=7393&view=rev
Author: jtuc
Date: 2010-11-01 09:57:10 +0000 (Mon, 01 Nov 2010)
Log Message:
-----------
Merge from trunk:
?\226?\128?\162 Read 7-Zip version from 7z.dll (which has long ago replaced the various format and codec DLLs)
?\226?\128?\162 Change recommended version of 7-Zip to 4.65
Modified Paths:
--------------
branches/R2_14/Src/7zCommon.cpp
Modified: branches/R2_14/Src/7zCommon.cpp
===================================================================
--- branches/R2_14/Src/7zCommon.cpp 2010-11-01 09:17:31 UTC (rev 7392)
+++ branches/R2_14/Src/7zCommon.cpp 2010-11-01 09:57:10 UTC (rev 7393)
@@ -89,6 +89,9 @@
2007-06-16 Jochen Neubeck FIX [1723263] "Zip --> Both" operation...
2007-12-22 Jochen Neubeck Fix Merge7z UI lang for new translation system
Change recommended version of 7-Zip to 4.57
+2010-05-16 Jochen Neubeck Read 7-Zip version from 7z.dll (which has long
+ ago replaced the various format and codec DLLs)
+ Change recommended version of 7-Zip to 4.65
*/
// ID line follows -- this is updated by SVN
@@ -102,7 +105,7 @@
#include "MainFrm.h"
#include "7zCommon.h"
//#include "ExternalArchiveFormat.h"
-#include "markdown.h"
+#include "version.h"
#include <afxinet.h>
#include <shlwapi.h>
#include <paths.h>
@@ -212,7 +215,7 @@
/**
* @brief Recommended version of 7-Zip.
*/
-const DWORD C7ZipMismatchException::m_dwVer7zRecommended = DWORD MAKELONG(57,4);
+const DWORD C7ZipMismatchException::m_dwVer7zRecommended = DWORD MAKELONG(65,4);
/**
* @brief Registry key for C7ZipMismatchException's ReportError() popup.
@@ -646,20 +649,11 @@
DWORD size = sizeof path;
SHGetValue(HKEY_LOCAL_MACHINE, szSubKey, szValue, &type, path, &size);
}
- PathAppend(path, _T("7zip_pad.xml"));
- CMarkdown::String version
- (
- CMarkdown::File(path)
- .Move("XML_DIZ_INFO").Pop()
- .Move("Program_Info").Pop()
- .Move("Program_Version").GetInnerText()
- );
- DWORD ver = (WORD)StrToIntA(version.A) << 16;
- if (LPSTR p = StrChrA(version.A, '.'))
- {
- ver |= (WORD)StrToIntA(p + 1);
- }
- return ver;
+ PathAppend(path, _T("7z.dll"));
+ DWORD versionMS = 0;
+ DWORD versionLS = 0;
+ CVersionInfo(path).GetFixedFileVersion(versionMS, versionLS);
+ return versionMS;
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jt...@us...> - 2010-11-01 09:17:38
|
Revision: 7392
http://winmerge.svn.sourceforge.net/winmerge/?rev=7392&view=rev
Author: jtuc
Date: 2010-11-01 09:17:31 +0000 (Mon, 01 Nov 2010)
Log Message:
-----------
PATCH: [ 3026022 ] Turn STL exceptions into MFC exceptions
Modified Paths:
--------------
branches/R2_14/Src/Merge.cpp
branches/R2_14/Src/Merge.vcproj
branches/R2_14/Src/MergeX64.vcproj
Modified: branches/R2_14/Src/Merge.cpp
===================================================================
--- branches/R2_14/Src/Merge.cpp 2010-10-31 15:03:57 UTC (rev 7391)
+++ branches/R2_14/Src/Merge.cpp 2010-11-01 09:17:31 UTC (rev 7392)
@@ -71,6 +71,63 @@
/** @brief Location for command line help to open. */
static TCHAR CommandLineHelpLocation[] = _T("::/htmlhelp/Command_line.html");
+
+/**
+ * @brief Turn STL exceptions into MFC exceptions.
+ * Based on the article "Visual C++ Exception-Handling Instrumentation"
+ * by Eugene Gershnik, published at http://www.drdobbs.com/184416600.
+ * Rethrow fix inspired by http://www.spinics.net/lists/wine/msg05996.html.
+ */
+namespace Turn_STL_exceptions_into_MFC_exceptions
+{
+# ifndef _STATIC_CPPLIB
+# error This hack only works with _STATIC_CPPLIB defined.
+# endif
+
+ class CDisguisedSTLException : public CException
+ {
+ private:
+ std::exception *m_pSTLException;
+ public:
+ CDisguisedSTLException(std::exception *pSTLException)
+ : m_pSTLException(pSTLException)
+ {
+ }
+ virtual BOOL GetErrorMessage(LPTSTR lpszError, UINT nMaxError, PUINT)
+ {
+ _sntprintf(lpszError, nMaxError, _T("%hs"), m_pSTLException->what());
+ return TRUE;
+ }
+ };
+
+ const DWORD CPP_EXCEPTION = 0xE06D7363;
+ const DWORD MS_MAGIC = 0x19930520;
+
+ extern "C" void __stdcall _CxxThrowException(void *pObject, _s__ThrowInfo const *pObjectInfo)
+ {
+ __declspec(thread) static ULONG_PTR args[3] = { MS_MAGIC, 0, 0 };
+ if (pObject == NULL)
+ {
+ pObject = reinterpret_cast<void *>(args[1]);
+ pObjectInfo = reinterpret_cast<_s__ThrowInfo const *>(args[2]);
+ }
+ else
+ {
+ args[1] = (ULONG_PTR)pObject;
+ args[2] = (ULONG_PTR)pObjectInfo;
+ }
+ if (int i = pObjectInfo->pCatchableTypeArray->nCatchableTypes)
+ {
+ const char *name = typeid(std::exception).raw_name();
+ if (pObjectInfo->pCatchableTypeArray->arrayOfCatchableTypes[i - 1]->pType->name == name)
+ {
+ throw new CDisguisedSTLException(static_cast<std::exception *>(pObject));
+ }
+ }
+ RaiseException(CPP_EXCEPTION, EXCEPTION_NONCONTINUABLE, _countof(args), args);
+ }
+}
+
/////////////////////////////////////////////////////////////////////////////
// CMergeApp
Modified: branches/R2_14/Src/Merge.vcproj
===================================================================
--- branches/R2_14/Src/Merge.vcproj 2010-10-31 15:03:57 UTC (rev 7391)
+++ branches/R2_14/Src/Merge.vcproj 2010-11-01 09:17:31 UTC (rev 7392)
@@ -51,7 +51,7 @@
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"
+ PreprocessorDefinitions="WIN32;_WINDOWS;_STATIC_CPPLIB;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"
@@ -158,7 +158,7 @@
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"
+ PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_STATIC_CPPLIB;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"
@@ -294,7 +294,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
UsePrecompiledHeader="0"
PrecompiledHeaderThrough=""
/>
@@ -404,7 +404,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -1170,7 +1170,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -1195,7 +1195,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -1297,7 +1297,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -2077,7 +2077,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -2154,7 +2154,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -2172,22 +2172,6 @@
<File
RelativePath="Merge.rc"
>
- <FileConfiguration
- Name="UnicodeRelease|Win32"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="UnicodeDebug|Win32"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;_AFXDLL;$(NoInherit)"
- />
- </FileConfiguration>
</File>
<File
RelativePath="MergeCmdLineInfo.cpp"
@@ -2249,7 +2233,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -2478,7 +2462,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -3040,7 +3024,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -3144,7 +3128,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -3429,7 +3413,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -3529,7 +3513,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
UsePrecompiledHeader="1"
/>
</FileConfiguration>
@@ -3968,7 +3952,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Modified: branches/R2_14/Src/MergeX64.vcproj
===================================================================
--- branches/R2_14/Src/MergeX64.vcproj 2010-10-31 15:03:57 UTC (rev 7391)
+++ branches/R2_14/Src/MergeX64.vcproj 2010-11-01 09:17:31 UTC (rev 7392)
@@ -55,7 +55,7 @@
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"
+ 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;_STATIC_CPPLIB"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -155,7 +155,7 @@
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="WIN64;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;HAVE_LIMITS_H;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE"
+ PreprocessorDefinitions="WIN64;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;HAVE_LIMITS_H;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_STATIC_CPPLIB"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -253,7 +253,7 @@
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"
+ 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;_STATIC_CPPLIB"
RuntimeLibrary="3"
RuntimeTypeInfo="true"
UsePrecompiledHeader="2"
@@ -349,7 +349,7 @@
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;WIN64;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;HAVE_LIMITS_H;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE"
+ PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;HAVE_LIMITS_H;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_STATIC_CPPLIB"
RuntimeLibrary="3"
RuntimeTypeInfo="true"
UsePrecompiledHeader="2"
@@ -1965,7 +1965,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -1975,7 +1975,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -2029,7 +2029,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -2039,7 +2039,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN64;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -2071,7 +2071,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -2081,7 +2081,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
</File>
@@ -5837,7 +5837,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -5847,7 +5847,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -5901,7 +5901,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -5911,7 +5911,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN64;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -5943,7 +5943,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -5953,7 +5953,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
</File>
@@ -5967,7 +5967,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -5977,7 +5977,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -6031,7 +6031,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -6041,7 +6041,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN64;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -6073,7 +6073,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -6083,7 +6083,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
</File>
@@ -6499,7 +6499,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -6509,7 +6509,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -6563,7 +6563,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -6573,7 +6573,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN64;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -6605,7 +6605,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -6615,7 +6615,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
</File>
@@ -10487,7 +10487,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -10497,7 +10497,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -10551,7 +10551,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -10561,7 +10561,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN64;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -10593,7 +10593,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -10603,7 +10603,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
</File>
@@ -10889,7 +10889,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -10899,7 +10899,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -10953,7 +10953,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -10963,7 +10963,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN64;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -10995,7 +10995,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -11005,93 +11005,13 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
</File>
<File
RelativePath="Merge.rc"
>
- <FileConfiguration
- Name="UnicodeRelease|Win32"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;_AFXDLL"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="UnicodeRelease|x64"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;_AFXDLL"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="UnicodeDebug|Win32"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;_AFXDLL"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="UnicodeDebug|x64"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;_AFXDLL"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|x64"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|Win32"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;_AFXDLL"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Debug|x64"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;_AFXDLL"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|Win32"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;_AFXDLL"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="X64 Release|x64"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;_AFXDLL"
- />
- </FileConfiguration>
</File>
<File
RelativePath="MergeCmdLineInfo.cpp"
@@ -11363,7 +11283,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -11373,7 +11293,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -11427,7 +11347,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -11437,7 +11357,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN64;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -11469,7 +11389,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -11479,7 +11399,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
</File>
@@ -12545,7 +12465,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -12555,7 +12475,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -12609,7 +12529,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -12619,7 +12539,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN64;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -12651,7 +12571,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -12661,7 +12581,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
</File>
@@ -15307,7 +15227,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -15317,7 +15237,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -15371,7 +15291,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -15381,7 +15301,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN64;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -15413,7 +15333,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -15423,7 +15343,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
</File>
@@ -15831,7 +15751,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -15841,7 +15761,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -15895,7 +15815,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -15905,7 +15825,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN64;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -15937,7 +15857,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -15947,7 +15867,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
</File>
@@ -17247,7 +17167,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -17257,7 +17177,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -17311,7 +17231,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -17321,7 +17241,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -17353,7 +17273,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -17363,7 +17283,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
</File>
@@ -17767,7 +17687,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
UsePrecompiledHeader="1"
/>
</FileConfiguration>
@@ -17778,7 +17698,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
UsePrecompiledHeader="1"
/>
</FileConfiguration>
@@ -17837,7 +17757,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"
+ PreprocessorDefinitions=""
UsePrecompiledHeader="1"
/>
</FileConfiguration>
@@ -17848,7 +17768,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN64;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"
+ PreprocessorDefinitions=""
UsePrecompiledHeader="1"
/>
</FileConfiguration>
@@ -17883,7 +17803,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
UsePrecompiledHeader="1"
/>
</FileConfiguration>
@@ -17894,7 +17814,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
UsePrecompiledHeader="1"
/>
</FileConfiguration>
@@ -19998,7 +19918,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -20008,7 +19928,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -20062,7 +19982,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -20072,7 +19992,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN64;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -20104,7 +20024,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
@@ -20114,7 +20034,7 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
</File>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jt...@us...> - 2010-10-31 15:04:03
|
Revision: 7391
http://winmerge.svn.sourceforge.net/winmerge/?rev=7391&view=rev
Author: jtuc
Date: 2010-10-31 15:03:57 +0000 (Sun, 31 Oct 2010)
Log Message:
-----------
Merge from trunk: GetSysError(nerr) -> GetSysError(nerr).c_str()
Modified Paths:
--------------
branches/R2_14/Src/FileTransform.cpp
Modified: branches/R2_14/Src/FileTransform.cpp
===================================================================
--- branches/R2_14/Src/FileTransform.cpp 2010-10-31 14:55:42 UTC (rev 7390)
+++ branches/R2_14/Src/FileTransform.cpp 2010-10-31 15:03:57 UTC (rev 7391)
@@ -449,7 +449,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
@@ -460,7 +460,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()));
}
}
@@ -495,7 +495,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
@@ -506,7 +506,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()));
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jt...@us...> - 2010-10-31 14:55:48
|
Revision: 7390
http://winmerge.svn.sourceforge.net/winmerge/?rev=7390&view=rev
Author: jtuc
Date: 2010-10-31 14:55:42 +0000 (Sun, 31 Oct 2010)
Log Message:
-----------
Merge from trunk: GetSysError(nerr) -> GetSysError(nerr).c_str()
Modified Paths:
--------------
branches/R2_14/Src/Common/multiformatText.cpp
Modified: branches/R2_14/Src/Common/multiformatText.cpp
===================================================================
--- branches/R2_14/Src/Common/multiformatText.cpp 2010-10-31 14:43:29 UTC (rev 7389)
+++ branches/R2_14/Src/Common/multiformatText.cpp 2010-10-31 14:55:42 UTC (rev 7390)
@@ -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());
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jt...@us...> - 2010-10-31 14:43:36
|
Revision: 7389
http://winmerge.svn.sourceforge.net/winmerge/?rev=7389&view=rev
Author: jtuc
Date: 2010-10-31 14:43:29 +0000 (Sun, 31 Oct 2010)
Log Message:
-----------
Merge from trunk: GetSysError(nerr) -> GetSysError(nerr).c_str()
Modified Paths:
--------------
branches/R2_14/Src/files.cpp
Modified: branches/R2_14/Src/files.cpp
===================================================================
--- branches/R2_14/Src/files.cpp 2010-10-31 14:32:29 UTC (rev 7388)
+++ branches/R2_14/Src/files.cpp 2010-10-31 14:43:29 UTC (rev 7389)
@@ -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: <jt...@us...> - 2010-10-31 14:32:35
|
Revision: 7388
http://winmerge.svn.sourceforge.net/winmerge/?rev=7388&view=rev
Author: jtuc
Date: 2010-10-31 14:32:29 +0000 (Sun, 31 Oct 2010)
Log Message:
-----------
Merge from trunk: GetSysError(nerr) -> GetSysError(nerr).c_str()
Modified Paths:
--------------
branches/R2_14/Src/VSSHelper.cpp
Modified: branches/R2_14/Src/VSSHelper.cpp
===================================================================
--- branches/R2_14/Src/VSSHelper.cpp 2010-10-31 14:20:14 UTC (rev 7387)
+++ branches/R2_14/Src/VSSHelper.cpp 2010-10-31 14:32:29 UTC (rev 7388)
@@ -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;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jt...@us...> - 2010-10-31 14:20:20
|
Revision: 7387
http://winmerge.svn.sourceforge.net/winmerge/?rev=7387&view=rev
Author: jtuc
Date: 2010-10-31 14:20:14 +0000 (Sun, 31 Oct 2010)
Log Message:
-----------
Restore HexMerge related code which was removed for 2.12.
Modified Paths:
--------------
branches/R2_14/Src/DirView.cpp
branches/R2_14/Src/resource.h
Modified: branches/R2_14/Src/DirView.cpp
===================================================================
--- branches/R2_14/Src/DirView.cpp 2010-10-31 13:18:46 UTC (rev 7386)
+++ branches/R2_14/Src/DirView.cpp 2010-10-31 14:20:14 UTC (rev 7387)
@@ -233,6 +233,8 @@
ON_UPDATE_COMMAND_UI(ID_MERGE_COMPARE, OnUpdateMergeCompare)
ON_COMMAND(ID_MERGE_COMPARE_XML, OnMergeCompareXML)
ON_UPDATE_COMMAND_UI(ID_MERGE_COMPARE_XML, OnUpdateMergeCompare)
+ ON_COMMAND(ID_MERGE_COMPARE_HEX, OnMergeCompareHex)
+ ON_UPDATE_COMMAND_UI(ID_MERGE_COMPARE_HEX, OnUpdateMergeCompare)
ON_COMMAND(ID_VIEW_TREEMODE, OnViewTreeMode)
ON_UPDATE_COMMAND_UI(ID_VIEW_TREEMODE, OnUpdateViewTreeMode)
ON_COMMAND(ID_VIEW_EXPAND_ALLSUBDIRS, OnViewExpandAllSubdirs)
Modified: branches/R2_14/Src/resource.h
===================================================================
--- branches/R2_14/Src/resource.h 2010-10-31 13:18:46 UTC (rev 7386)
+++ branches/R2_14/Src/resource.h 2010-10-31 14:20:14 UTC (rev 7387)
@@ -948,6 +948,7 @@
#define ID_TOOLS_GENERATEREPORT 32868
#define ID_MERGE_COMPARE 32869
#define ID_MERGE_COMPARE_XML 32870
+#define ID_MERGE_COMPARE_HEX 32871
#define ID_UNPACK_MANUAL 32880
#define ID_UNPACK_AUTO 32881
#define ID_POPUP_OPEN_WITH_UNPACKER 32882
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-10-31 13:18:52
|
Revision: 7386
http://winmerge.svn.sourceforge.net/winmerge/?rev=7386&view=rev
Author: gerundt
Date: 2010-10-31 13:18:46 +0000 (Sun, 31 Oct 2010)
Log Message:
-----------
Drop ANSI config from PreLink.bat - R2_14
Modified Paths:
--------------
branches/R2_14/Src/PreLink.bat
Modified: branches/R2_14/Src/PreLink.bat
===================================================================
--- branches/R2_14/Src/PreLink.bat 2010-10-31 13:17:39 UTC (rev 7385)
+++ branches/R2_14/Src/PreLink.bat 2010-10-31 13:18:46 UTC (rev 7386)
@@ -49,21 +49,11 @@
mkdir ..\Build\heksedit
goto %1
-:.\..\BuildTmp\MergeDebug
-%info% ANSI/Debug
-mkdir ..\Build\MergeDebug
-goto Debug
-
:.\..\BuildTmp\MergeUnicodeDebug
%info% UNICODE/Debug
mkdir ..\Build\MergeUnicodeDebug
goto Debug
-:.\..\BuildTmp\MergeRelease
-%info% ANSI/Release
-mkdir ..\Build\MergeRelease
-goto Release
-
:.\..\BuildTmp\MergeUnicodeRelease
%info% UNICODE/Release
mkdir ..\Build\MergeUnicodeRelease
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-10-31 13:17:45
|
Revision: 7385
http://winmerge.svn.sourceforge.net/winmerge/?rev=7385&view=rev
Author: gerundt
Date: 2010-10-31 13:17:39 +0000 (Sun, 31 Oct 2010)
Log Message:
-----------
Drop ANSI config from PreLink.bat
Modified Paths:
--------------
trunk/Src/PreLink.bat
Modified: trunk/Src/PreLink.bat
===================================================================
--- trunk/Src/PreLink.bat 2010-10-31 11:43:34 UTC (rev 7384)
+++ trunk/Src/PreLink.bat 2010-10-31 13:17:39 UTC (rev 7385)
@@ -49,21 +49,11 @@
mkdir ..\Build\heksedit
goto %1
-:.\..\BuildTmp\MergeDebug
-%info% ANSI/Debug
-mkdir ..\Build\MergeDebug
-goto Debug
-
:.\..\BuildTmp\MergeUnicodeDebug
%info% UNICODE/Debug
mkdir ..\Build\MergeUnicodeDebug
goto Debug
-:.\..\BuildTmp\MergeRelease
-%info% ANSI/Release
-mkdir ..\Build\MergeRelease
-goto Release
-
:.\..\BuildTmp\MergeUnicodeRelease
%info% UNICODE/Release
mkdir ..\Build\MergeUnicodeRelease
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-10-31 11:43:42
|
Revision: 7384
http://winmerge.svn.sourceforge.net/winmerge/?rev=7384&view=rev
Author: gerundt
Date: 2010-10-31 11:43:34 +0000 (Sun, 31 Oct 2010)
Log Message:
-----------
PATCH: [ 3095046 ] Drop Ansi config from x86 project
Modified Paths:
--------------
branches/R2_14/Src/Merge.vcproj
branches/R2_14/WinMerge.sln
Modified: branches/R2_14/Src/Merge.vcproj
===================================================================
--- branches/R2_14/Src/Merge.vcproj 2010-10-31 10:42:48 UTC (rev 7383)
+++ branches/R2_14/Src/Merge.vcproj 2010-10-31 11:43:34 UTC (rev 7384)
@@ -226,216 +226,6 @@
CommandLine="PostBuild.bat $(IntDir) $(TargetPath)"
/>
</Configuration>
- <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 libexpat.lib pcre.lib scew_d.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
- 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 scew.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>
@@ -468,27 +258,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="AboutDlg.cpp"
@@ -514,27 +283,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath=".\AnsiConvert.cpp"
@@ -564,31 +312,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- PrecompiledHeaderThrough=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <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"
@@ -614,27 +337,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath=".\Common\Bitmap.cpp"
@@ -664,27 +366,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="charsets.c"
@@ -712,29 +393,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- />
- </FileConfiguration>
</File>
<File
RelativePath="ChildFrm.cpp"
@@ -760,27 +418,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <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"
@@ -806,27 +443,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="Common\CMoveConstraint.cpp"
@@ -852,27 +468,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="codepage.cpp"
@@ -898,27 +493,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="codepage_detect.cpp"
@@ -944,27 +518,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="ColorButton.cpp"
@@ -990,27 +543,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="CompareOptions.cpp"
@@ -1042,33 +574,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- PrecompiledHeaderThrough=""
- PrecompiledHeaderFile=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- PrecompiledHeaderThrough=""
- PrecompiledHeaderFile=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="CompareStatisticsDlg.cpp"
@@ -1094,27 +599,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="CompareStats.cpp"
@@ -1146,33 +630,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- PrecompiledHeaderThrough=""
- PrecompiledHeaderFile=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- PrecompiledHeaderThrough=""
- PrecompiledHeaderFile=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="ConfigLog.cpp"
@@ -1198,27 +655,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="ConfirmFolderCopyDlg.cpp"
@@ -1244,27 +680,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="ConflictFileParser.cpp"
@@ -1290,27 +705,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="Common\coretools.cpp"
@@ -1338,29 +732,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- />
- </FileConfiguration>
</File>
<File
RelativePath="Common\CShellFileOp.cpp"
@@ -1386,27 +757,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="Common\CSubclass.cpp"
@@ -1432,27 +782,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="DiffContext.cpp"
@@ -1478,27 +807,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="DiffFileData.cpp"
@@ -1524,27 +832,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="DiffFileInfo.cpp"
@@ -1570,27 +857,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="DiffItem.cpp"
@@ -1616,27 +882,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="DiffItemList.cpp"
@@ -1664,29 +909,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- />
- </FileConfiguration>
</File>
<File
RelativePath="DiffList.cpp"
@@ -1712,27 +934,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="DiffTextBuffer.cpp"
@@ -1758,27 +959,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="DiffThread.cpp"
@@ -1804,27 +984,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="DiffViewBar.cpp"
@@ -1850,27 +1009,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="DiffWrapper.cpp"
@@ -1896,27 +1034,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="DirActions.cpp"
@@ -1942,27 +1059,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="DirCmpReport.cpp"
@@ -1988,27 +1084,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="DirCmpReportDlg.cpp"
@@ -2034,27 +1109,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="DirColsDlg.cpp"
@@ -2080,27 +1134,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="DirCompProgressDlg.cpp"
@@ -2126,27 +1159,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="DirDoc.cpp"
@@ -2172,27 +1184,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <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="DirFrame.cpp"
@@ -2218,27 +1209,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <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="DirItem.cpp"
@@ -2264,27 +1234,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="DirScan.cpp"
@@ -2310,27 +1259,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="DirTravel.cpp"
@@ -2358,29 +1286,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- />
- </FileConfiguration>
</File>
<File
RelativePath="DirView.cpp"
@@ -2406,27 +1311,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <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="DirViewColHandler.cpp"
@@ -2452,27 +1336,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="DirViewColItems.cpp"
@@ -2498,27 +1361,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="Common\dllproxy.c"
@@ -2546,29 +1388,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- />
- </FileConfiguration>
</File>
<File
RelativePath="dllpstub.cpp"
@@ -2594,27 +1413,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="EditorFilepathBar.cpp"
@@ -2640,27 +1438,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="Environment.cpp"
@@ -2686,27 +1463,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="FileActionScript.cpp"
@@ -2732,27 +1488,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="FileFilterHelper.cpp"
@@ -2778,27 +1513,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="FileFilterMgr.cpp"
@@ -2824,27 +1538,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="FileFiltersDlg.cpp"
@@ -2870,27 +1563,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="FileOrFolderSelect.cpp"
@@ -2916,27 +1588,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="FilepathEdit.cpp"
@@ -2962,27 +1613,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="files.cpp"
@@ -3008,27 +1638,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="FileTextEncoding.cpp"
@@ -3054,27 +1663,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="FileTransform.cpp"
@@ -3100,27 +1688,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="FileVersion.cpp"
@@ -3152,33 +1719,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- PrecompiledHeaderThrough=""
- PrecompiledHeaderFile=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- PrecompiledHeaderThrough=""
- PrecompiledHeaderFile=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="FilterCommentsManager.cpp"
@@ -3204,27 +1744,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="FilterList.cpp"
@@ -3250,27 +1769,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="FolderCmp.cpp"
@@ -3296,27 +1794,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="GhostTextBuffer.cpp"
@@ -3342,27 +1819,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="GhostTextView.cpp"
@@ -3388,27 +1844,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath=".\HexMergeDoc.cpp"
@@ -3446,27 +1881,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath=".\LineFiltersDlg.cpp"
@@ -3500,31 +1914,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- PrecompiledHeaderThrough=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- PrecompiledHeaderThrough=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="LoadSaveCodepageDlg.cpp"
@@ -3550,27 +1939,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="locality.cpp"
@@ -3596,27 +1964,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="LocationBar.cpp"
@@ -3642,27 +1989,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="LocationView.cpp"
@@ -3688,27 +2014,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="Common\LogFile.cpp"
@@ -3734,27 +2039,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="Common\lwdisp.c"
@@ -3782,29 +2066,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- />
- </FileConfiguration>
</File>
<File
RelativePath="MainFrm.cpp"
@@ -3830,27 +2091,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <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="markdown.cpp"
@@ -3878,29 +2118,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- />
- </FileConfiguration>
</File>
<File
RelativePath="Common\MDITabBar.cpp"
@@ -3926,27 +2143,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="Merge.cpp"
@@ -3972,27 +2168,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <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="Merge.rc"
@@ -4038,27 +2213,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="MergeDiffDetailView.cpp"
@@ -4084,27 +2238,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="MergeDoc.cpp"
@@ -4130,27 +2263,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <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="MergeDocDiffSync.cpp"
@@ -4176,27 +2288,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="MergeDocEncoding.cpp"
@@ -4222,27 +2313,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="MergeDocLineDiffs.cpp"
@@ -4268,27 +2338,6 @@
BrowseInformation="1"
/>
</FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"
- />
- </FileConfiguration>
- <Fi...
[truncated message content] |
|
From: <jt...@us...> - 2010-10-31 10:42:54
|
Revision: 7383
http://winmerge.svn.sourceforge.net/winmerge/?rev=7383&view=rev
Author: jtuc
Date: 2010-10-31 10:42:48 +0000 (Sun, 31 Oct 2010)
Log Message:
-----------
IDR_POPUP_DIRVIEW MENU - revised wording as discussed in forum
Modified Paths:
--------------
branches/R2_14/Src/Merge.rc
Modified: branches/R2_14/Src/Merge.rc
===================================================================
--- branches/R2_14/Src/Merge.rc 2010-10-31 10:37:58 UTC (rev 7382)
+++ branches/R2_14/Src/Merge.rc 2010-10-31 10:42:48 UTC (rev 7383)
@@ -503,9 +503,10 @@
POPUP "_ITEM_POPUP_"
BEGIN
MENUITEM "Comp&are", ID_MERGE_COMPARE
- POPUP "Co&mpare Special"
+ POPUP "Co&mpare As"
BEGIN
MENUITEM "&XML", ID_MERGE_COMPARE_XML
+ MENUITEM "&Binary", ID_MERGE_COMPARE_HEX
END
MENUITEM SEPARATOR
POPUP "&Copy"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jt...@us...> - 2010-10-31 10:38:04
|
Revision: 7382
http://winmerge.svn.sourceforge.net/winmerge/?rev=7382&view=rev
Author: jtuc
Date: 2010-10-31 10:37:58 +0000 (Sun, 31 Oct 2010)
Log Message:
-----------
IDR_POPUP_DIRVIEW MENU - revised wording as discussed in forum
Modified Paths:
--------------
trunk/Src/Merge.rc
Modified: trunk/Src/Merge.rc
===================================================================
--- trunk/Src/Merge.rc 2010-10-30 09:53:13 UTC (rev 7381)
+++ trunk/Src/Merge.rc 2010-10-31 10:37:58 UTC (rev 7382)
@@ -503,10 +503,10 @@
POPUP "_ITEM_POPUP_"
BEGIN
MENUITEM "Comp&are", ID_MERGE_COMPARE
- POPUP "Co&mpare Special"
+ POPUP "Co&mpare As"
BEGIN
MENUITEM "&XML", ID_MERGE_COMPARE_XML
- MENUITEM "&HEX", ID_MERGE_COMPARE_HEX
+ MENUITEM "&Binary", ID_MERGE_COMPARE_HEX
END
MENUITEM SEPARATOR
POPUP "&Copy"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2010-10-30 09:53:20
|
Revision: 7381
http://winmerge.svn.sourceforge.net/winmerge/?rev=7381&view=rev
Author: kimmov
Date: 2010-10-30 09:53:13 +0000 (Sat, 30 Oct 2010)
Log Message:
-----------
Remove hexedit from WinMerge sources. 2.14 branch also now uses the editor component
from installed Frhed.
Modified Paths:
--------------
branches/R2_14/Docs/Developers/SVN_Organisation.txt
branches/R2_14/Docs/Developers/readme-InnoSetup.html
branches/R2_14/Docs/Developers/readme-WIX.html
branches/R2_14/Installer/InnoSetup/WinMerge.iss
branches/R2_14/Installer/WiX/Config.wxi
branches/R2_14/Installer/WiX/Fragments/Core.wxs
branches/R2_14/Installer/WiX/Fragments/Features.wxs
branches/R2_14/Src/PreLink.bat
Removed Paths:
-------------
branches/R2_14/Externals/heksedit/
Modified: branches/R2_14/Docs/Developers/SVN_Organisation.txt
===================================================================
--- branches/R2_14/Docs/Developers/SVN_Organisation.txt 2010-10-28 17:41:34 UTC (rev 7380)
+++ branches/R2_14/Docs/Developers/SVN_Organisation.txt 2010-10-30 09:53:13 UTC (rev 7381)
@@ -13,7 +13,6 @@
- Manual
- Externals
- expat
- - heksedit
- pcre
- scew
- Filters
@@ -82,9 +81,6 @@
WinMerge/Externals/expat/
- Expat XML parser <http://expat.sourceforge.net/>
-WinMerge/Externals/heksedit/
- - Frhed binary file editor's heksedit component <http://frhed.sourceforge.net/>
-
WinMerge/Externals/pcre/
- PCRE - Perl Compatible Regular Expression <http://www.pcre.org/>
Modified: branches/R2_14/Docs/Developers/readme-InnoSetup.html
===================================================================
--- branches/R2_14/Docs/Developers/readme-InnoSetup.html 2010-10-28 17:41:34 UTC (rev 7380)
+++ branches/R2_14/Docs/Developers/readme-InnoSetup.html 2010-10-30 09:53:13 UTC (rev 7381)
@@ -101,12 +101,6 @@
</ul>
</li>
<li>
- <code>heksedit</code>
- <ul>
- <li><code>hekseditU.dll</code></li>
- </ul>
- </li>
- <li>
<code>Manual/htmlhelp</code>
<ul>
<li><code>WinMerge.chm</code></li>
Modified: branches/R2_14/Docs/Developers/readme-WIX.html
===================================================================
--- branches/R2_14/Docs/Developers/readme-WIX.html 2010-10-28 17:41:34 UTC (rev 7380)
+++ branches/R2_14/Docs/Developers/readme-WIX.html 2010-10-30 09:53:13 UTC (rev 7381)
@@ -100,12 +100,6 @@
</ul>
</li>
<li>
- <code>heksedit</code>
- <ul>
- <li><code>hekseditU.dll</code></li>
- </ul>
- </li>
- <li>
<code>Manual/htmlhelp</code>
<ul>
<li><code>WinMerge.chm</code></li>
Modified: branches/R2_14/Installer/InnoSetup/WinMerge.iss
===================================================================
--- branches/R2_14/Installer/InnoSetup/WinMerge.iss 2010-10-28 17:41:34 UTC (rev 7380)
+++ branches/R2_14/Installer/InnoSetup/WinMerge.iss 2010-10-30 09:53:13 UTC (rev 7381)
@@ -414,9 +414,6 @@
; MergeLang.dll - translation helper dll
Source: ..\..\Build\MergeUnicodeRelease\MergeLang.dll; DestDir: {app}; Flags: promptifolder; Components: Core
-; Binary file editor
-Source: ..\..\Build\heksedit\hekseditU.dll; DestDir: {app}; Flags: promptifolder; Components: Core
-
; Language files
Source: ..\..\Src\Languages\Brazilian.po; DestDir: {app}\Languages; Components: Languages\PortugueseBrazilian; Flags: ignoreversion comparetimestamp
Source: ..\..\Docs\Users\Languages\ReadMe-Brazilian.txt; DestDir: {app}\Docs; Components: Languages\PortugueseBrazilian
Modified: branches/R2_14/Installer/WiX/Config.wxi
===================================================================
--- branches/R2_14/Installer/WiX/Config.wxi 2010-10-28 17:41:34 UTC (rev 7380)
+++ branches/R2_14/Installer/WiX/Config.wxi 2010-10-30 09:53:13 UTC (rev 7381)
@@ -20,7 +20,6 @@
<?define ProgramFilesFolder = "ProgramFiles64Folder" ?>
<?define MergeBuildDir = "..\..\Build\x64\MergeRelease" ?>
- <?define HekseditBuildDir = "..\..\Build\heksedit\x64\Release" ?>
<?define ExpatBuildDir = "..\..\Build\expat\lib\x64\Release" ?>
<?define PcreBuildDir = "..\..\Build\pcre\lib\x64\Release" ?>
<?define ShellExtBuildDir = "..\..\Build\ShellExtension\x64 release" ?>
@@ -38,7 +37,6 @@
<?define ProgramFilesFolder = "ProgramFilesFolder" ?>
<?define MergeBuildDir = "..\..\Build\MergeUnicodeRelease" ?>
<?define ExpatBuildDir = "..\..\Build\expat" ?>
- <?define HekseditBuildDir = "..\..\Build\heksedit" ?>
<?define PcreBuildDir = "..\..\Build\pcre" ?>
<?define ShellExtBuildDir = "..\..\Build\MergeUnicodeRelease" ?>
Modified: branches/R2_14/Installer/WiX/Fragments/Core.wxs
===================================================================
--- branches/R2_14/Installer/WiX/Fragments/Core.wxs 2010-10-28 17:41:34 UTC (rev 7380)
+++ branches/R2_14/Installer/WiX/Fragments/Core.wxs 2010-10-30 09:53:13 UTC (rev 7381)
@@ -17,13 +17,6 @@
Vital="yes" />
</Component>
- <Component Id="heksedit" Guid="*" Win64="$(var.Win64)">
- <File Id="hekseditUDLL"
- Name="hekseditU.dll"
- Source="$(var.HekseditBuildDir)\hekseditU.dll"
- Vital="yes" />
- </Component>
-
<Component Id="pcre" Guid="*" Win64="$(var.Win64)">
<File Id="pcreDLL"
Name="pcre.dll"
Modified: branches/R2_14/Installer/WiX/Fragments/Features.wxs
===================================================================
--- branches/R2_14/Installer/WiX/Fragments/Features.wxs 2010-10-28 17:41:34 UTC (rev 7380)
+++ branches/R2_14/Installer/WiX/Fragments/Features.wxs 2010-10-30 09:53:13 UTC (rev 7381)
@@ -16,7 +16,6 @@
<ComponentRef Id="WinMergeU" />
<ComponentRef Id="libexpat" />
<ComponentRef Id="pcre" />
- <ComponentRef Id="heksedit" />
<ComponentRef Id="MergeLang" />
<ComponentRef Id="StartMenuShortcuts" />
<ComponentRef Id="DesktopShortcut" />
Modified: branches/R2_14/Src/PreLink.bat
===================================================================
--- branches/R2_14/Src/PreLink.bat 2010-10-28 17:41:34 UTC (rev 7380)
+++ branches/R2_14/Src/PreLink.bat 2010-10-30 09:53:13 UTC (rev 7381)
@@ -52,65 +52,21 @@
:.\..\BuildTmp\MergeDebug
%info% ANSI/Debug
mkdir ..\Build\MergeDebug
-
-REM Build heksedit
-cd %2\..\..\..\Externals\heksedit
-%msdev% "heksedit.dsp" /make "heksedit - Win32 Debug"
-%devenv% "heksedit.vcproj" /build "Debug"
-cd %2\..\..\heksedit\Debug
-copy heksedit.dll %2\..\
-copy heksedit.dll ..\
-mkdir %2\..\heksedit.lng
-copy heksedit.lng\*.* %2\..\heksedit.lng
-
goto Debug
:.\..\BuildTmp\MergeUnicodeDebug
%info% UNICODE/Debug
mkdir ..\Build\MergeUnicodeDebug
-
-REM Build heksedit
-cd %2\..\..\..\Externals\heksedit
-%msdev% "heksedit.dsp" /make "heksedit - Win32 UnicodeDebug"
-%devenv% "heksedit.vcproj" /build "UnicodeDebug"
-cd %2\..\..\heksedit\Debug
-copy hekseditU.dll %2\..\
-copy hekseditU.dll ..\
-mkdir %2\..\heksedit.lng
-copy heksedit.lng\*.* %2\..\heksedit.lng
-
goto Debug
:.\..\BuildTmp\MergeRelease
%info% ANSI/Release
mkdir ..\Build\MergeRelease
-
-REM Build heksedit
-cd %2\..\..\..\Externals\heksedit
-%msdev% "heksedit.dsp" /make "heksedit - Win32 Release"
-%devenv% "heksedit.vcproj" /build "Release"
-cd %2\..\..\heksedit\Release
-copy heksedit.dll %2\..\
-copy heksedit.dll ..\
-mkdir %2\..\heksedit.lng
-copy heksedit.lng\*.* %2\..\heksedit.lng
-
goto Release
:.\..\BuildTmp\MergeUnicodeRelease
%info% UNICODE/Release
mkdir ..\Build\MergeUnicodeRelease
-
-REM Build heksedit
-cd %2\..\..\..\Externals\heksedit
-%msdev% "heksedit.dsp" /make "heksedit - Win32 UnicodeRelease"
-%devenv% "heksedit.vcproj" /build "UnicodeRelease"
-cd %2\..\..\heksedit\Release
-copy hekseditU.dll %2\..\
-copy hekseditU.dll ..\
-mkdir %2\..\heksedit.lng
-copy heksedit.lng\*.* %2\..\heksedit.lng
-
goto Release
:Debug
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2010-10-28 17:41:40
|
Revision: 7380
http://winmerge.svn.sourceforge.net/winmerge/?rev=7380&view=rev
Author: kimmov
Date: 2010-10-28 17:41:34 +0000 (Thu, 28 Oct 2010)
Log Message:
-----------
Changelog: Updated PCRE and SCEW.
Modified Paths:
--------------
branches/R2_14/Docs/Users/ChangeLog.txt
Modified: branches/R2_14/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_14/Docs/Users/ChangeLog.txt 2010-10-28 17:17:07 UTC (rev 7379)
+++ branches/R2_14/Docs/Users/ChangeLog.txt 2010-10-28 17:41:34 UTC (rev 7380)
@@ -4,6 +4,8 @@
http://winmerge.org/tracker/[tracker-id]
WinMerge 2.13.21
+ Update PCRE to version 8.10
+ Update SCEW to version 1.1.2
Improve startup time (#2788142)
Add menuitems for selecting automatic or manual prediffing (#2638608)
Add accelerator keys for Shell context menu (#2823536)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2010-10-28 17:17:15
|
Revision: 7379
http://winmerge.svn.sourceforge.net/winmerge/?rev=7379&view=rev
Author: kimmov
Date: 2010-10-28 17:17:07 +0000 (Thu, 28 Oct 2010)
Log Message:
-----------
Revert heksedit project file update accidentally committed with PCRE update commit.
Modified Paths:
--------------
branches/R2_14/Externals/heksedit/heksedit.vcproj
Modified: branches/R2_14/Externals/heksedit/heksedit.vcproj
===================================================================
--- branches/R2_14/Externals/heksedit/heksedit.vcproj 2010-10-28 15:31:08 UTC (rev 7378)
+++ branches/R2_14/Externals/heksedit/heksedit.vcproj 2010-10-28 17:17:07 UTC (rev 7379)
@@ -1,58 +1,32 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="9.00"
+ Version="7.10"
Name="heksedit"
ProjectGUID="{15EE10B9-011A-4781-ACBC-22F1CFEB5610}"
- TargetFrameworkVersion="131072"
- >
+ SccProjectName=""
+ SccLocalPath="">
<Platforms>
<Platform
- Name="Win32"
- />
+ Name="Win32"/>
</Platforms>
- <ToolFiles>
- </ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory=".\..\..\Build\heksedit\$(ConfigurationName)"
IntermediateDirectory=".\..\..\BuildTmp\heksedit\$(ConfigurationName)"
ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- >
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG"
- MkTypLibCompatible="true"
- SuppressStartupBanner="true"
- TargetEnvironment="1"
- TypeLibraryName=".\..\..\Build\heksedit\$(ConfigurationName)\heksedit.tlb"
- HeaderFileName=""
- />
- <Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- StringPooling="true"
- ExceptionHandling="0"
+ StringPooling="TRUE"
+ ExceptionHandling="FALSE"
RuntimeLibrary="3"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="precomp.h"
PrecompiledHeaderFile=".\..\..\BuildTmp\heksedit\$(ConfigurationName)\heksedit.pch"
AssemblerListingLocation=".\..\..\BuildTmp\heksedit\$(ConfigurationName)\"
@@ -60,97 +34,68 @@
ProgramDataBaseFileName=".\..\..\BuildTmp\heksedit\$(ConfigurationName)\"
BrowseInformation="1"
WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="1"
- />
+ SuppressStartupBanner="TRUE"
+ DebugInformationFormat="1"/>
<Tool
- Name="VCManagedResourceCompilerTool"
- />
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1031"
- />
- <Tool
- Name="VCPreLinkEventTool"
- CommandLine="PreLink.bat $(IntDir) $(TargetPath)"
- />
- <Tool
Name="VCLinkerTool"
AdditionalDependencies="version.lib comctl32.lib wininet.lib shlwapi.lib htmlhelp.lib"
OutputFile="..\..\Build\heksedit\Debug\heksedit.dll"
LinkIncremental="1"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=""
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\Build\heksedit\$(ConfigurationName)\heksedit.pdb"
SubSystem="2"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
ImportLibrary=".\..\..\Build\heksedit\$(ConfigurationName)\heksedit.lib"
- TargetMachine="1"
- />
+ TargetMachine="1"/>
<Tool
- Name="VCALinkTool"
- />
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="_DEBUG"
+ MkTypLibCompatible="TRUE"
+ SuppressStartupBanner="TRUE"
+ TargetEnvironment="1"
+ TypeLibraryName=".\..\..\Build\heksedit\$(ConfigurationName)\heksedit.tlb"
+ HeaderFileName=""/>
<Tool
- Name="VCManifestTool"
- />
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"
- />
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- />
+ Name="VCPreLinkEventTool"
+ CommandLine="PreLink.bat $(IntDir) $(TargetPath)"/>
<Tool
- Name="VCFxCopTool"
- />
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1031"/>
<Tool
- Name="VCAppVerifierTool"
- />
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"
- />
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory=".\..\..\Build\heksedit\$(ConfigurationName)"
IntermediateDirectory=".\..\..\BuildTmp\heksedit\$(ConfigurationName)"
ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- >
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
- MkTypLibCompatible="true"
- SuppressStartupBanner="true"
- TargetEnvironment="1"
- TypeLibraryName=".\..\..\Build\heksedit\$(ConfigurationName)\heksedit.tlb"
- HeaderFileName=""
- />
- <Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- StringPooling="true"
- ExceptionHandling="0"
+ StringPooling="TRUE"
+ ExceptionHandling="FALSE"
RuntimeLibrary="2"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="precomp.h"
PrecompiledHeaderFile=".\..\..\BuildTmp\heksedit\$(ConfigurationName)\heksedit.pch"
AssemblerListingLocation=".\..\..\BuildTmp\heksedit\$(ConfigurationName)\"
@@ -158,95 +103,66 @@
ProgramDataBaseFileName=".\..\..\BuildTmp\heksedit\$(ConfigurationName)\"
BrowseInformation="1"
WarningLevel="3"
- SuppressStartupBanner="true"
- />
+ SuppressStartupBanner="TRUE"/>
<Tool
- Name="VCManagedResourceCompilerTool"
- />
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1031"
- />
- <Tool
- Name="VCPreLinkEventTool"
- CommandLine="PreLink.bat $(IntDir) $(TargetPath)"
- />
- <Tool
Name="VCLinkerTool"
AdditionalDependencies="version.lib comctl32.lib wininet.lib shlwapi.lib htmlhelp.lib"
OutputFile="..\..\Build\heksedit\$(ConfigurationName)\heksedit.dll"
LinkIncremental="1"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=""
ProgramDatabaseFile="..\..\Build\heksedit\$(ConfigurationName)\heksedit.pdb"
SubSystem="2"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
ImportLibrary=".\..\..\Build\heksedit\$(ConfigurationName)\heksedit.lib"
- TargetMachine="1"
- />
+ TargetMachine="1"/>
<Tool
- Name="VCALinkTool"
- />
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="NDEBUG"
+ MkTypLibCompatible="TRUE"
+ SuppressStartupBanner="TRUE"
+ TargetEnvironment="1"
+ TypeLibraryName=".\..\..\Build\heksedit\$(ConfigurationName)\heksedit.tlb"
+ HeaderFileName=""/>
<Tool
- Name="VCManifestTool"
- />
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"
- />
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- />
+ Name="VCPreLinkEventTool"
+ CommandLine="PreLink.bat $(IntDir) $(TargetPath)"/>
<Tool
- Name="VCFxCopTool"
- />
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1031"/>
<Tool
- Name="VCAppVerifierTool"
- />
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"
- />
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="UnicodeDebug|Win32"
OutputDirectory=".\..\..\Build\heksedit\$(ConfigurationName)"
IntermediateDirectory=".\..\..\BuildTmp\heksedit\$(ConfigurationName)"
ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- >
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG"
- MkTypLibCompatible="true"
- SuppressStartupBanner="true"
- TargetEnvironment="1"
- TypeLibraryName=".\..\..\Build\heksedit\$(ConfigurationName)\heksedit.tlb"
- HeaderFileName=""
- />
- <Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;UNICODE;_UNICODE"
- StringPooling="true"
- ExceptionHandling="0"
+ StringPooling="TRUE"
+ ExceptionHandling="FALSE"
RuntimeLibrary="3"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="precomp.h"
PrecompiledHeaderFile=".\..\..\BuildTmp\heksedit\$(ConfigurationName)\heksedit.pch"
AssemblerListingLocation=".\..\..\BuildTmp\heksedit\$(ConfigurationName)\"
@@ -254,97 +170,68 @@
ProgramDataBaseFileName=".\..\..\BuildTmp\heksedit\$(ConfigurationName)\"
BrowseInformation="1"
WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="1"
- />
+ SuppressStartupBanner="TRUE"
+ DebugInformationFormat="1"/>
<Tool
- Name="VCManagedResourceCompilerTool"
- />
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1031"
- />
- <Tool
- Name="VCPreLinkEventTool"
- CommandLine="PreLink.bat $(IntDir) $(TargetPath)"
- />
- <Tool
Name="VCLinkerTool"
AdditionalDependencies="version.lib comctl32.lib wininet.lib shlwapi.lib htmlhelp.lib"
OutputFile="..\..\Build\heksedit\Debug\hekseditU.dll"
LinkIncremental="1"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=""
- GenerateDebugInformation="true"
+ GenerateDebugInformation="TRUE"
ProgramDatabaseFile="..\..\Build\heksedit\$(ConfigurationName)\heksedit.pdb"
SubSystem="2"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
ImportLibrary=".\..\..\Build\heksedit\$(ConfigurationName)\heksedit.lib"
- TargetMachine="1"
- />
+ TargetMachine="1"/>
<Tool
- Name="VCALinkTool"
- />
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="_DEBUG"
+ MkTypLibCompatible="TRUE"
+ SuppressStartupBanner="TRUE"
+ TargetEnvironment="1"
+ TypeLibraryName=".\..\..\Build\heksedit\$(ConfigurationName)\heksedit.tlb"
+ HeaderFileName=""/>
<Tool
- Name="VCManifestTool"
- />
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"
- />
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- />
+ Name="VCPreLinkEventTool"
+ CommandLine="PreLink.bat $(IntDir) $(TargetPath)"/>
<Tool
- Name="VCFxCopTool"
- />
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1031"/>
<Tool
- Name="VCAppVerifierTool"
- />
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"
- />
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="UnicodeRelease|Win32"
OutputDirectory=".\..\..\Build\heksedit\$(ConfigurationName)"
IntermediateDirectory=".\..\..\BuildTmp\heksedit\$(ConfigurationName)"
ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- >
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
- MkTypLibCompatible="true"
- SuppressStartupBanner="true"
- TargetEnvironment="1"
- TypeLibraryName=".\..\..\Build\heksedit\$(ConfigurationName)\heksedit.tlb"
- HeaderFileName=""
- />
- <Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;UNICODE;_UNICODE"
- StringPooling="true"
- ExceptionHandling="0"
+ StringPooling="TRUE"
+ ExceptionHandling="FALSE"
RuntimeLibrary="2"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="3"
PrecompiledHeaderThrough="precomp.h"
PrecompiledHeaderFile=".\..\..\BuildTmp\heksedit\$(ConfigurationName)\heksedit.pch"
AssemblerListingLocation=".\..\..\BuildTmp\heksedit\$(ConfigurationName)\"
@@ -352,55 +239,49 @@
ProgramDataBaseFileName=".\..\..\BuildTmp\heksedit\$(ConfigurationName)\"
BrowseInformation="1"
WarningLevel="3"
- SuppressStartupBanner="true"
- />
+ SuppressStartupBanner="TRUE"/>
<Tool
- Name="VCManagedResourceCompilerTool"
- />
+ Name="VCCustomBuildTool"/>
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1031"
- />
- <Tool
- Name="VCPreLinkEventTool"
- CommandLine="PreLink.bat $(IntDir) $(TargetPath)"
- />
- <Tool
Name="VCLinkerTool"
AdditionalDependencies="version.lib comctl32.lib wininet.lib shlwapi.lib htmlhelp.lib"
OutputFile="..\..\Build\heksedit\Release\hekseditU.dll"
LinkIncremental="1"
- SuppressStartupBanner="true"
+ SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=""
ProgramDatabaseFile="..\..\Build\heksedit\$(ConfigurationName)\heksedit.pdb"
SubSystem="2"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
ImportLibrary=".\..\..\Build\heksedit\$(ConfigurationName)\heksedit.lib"
- TargetMachine="1"
- />
+ TargetMachine="1"/>
<Tool
- Name="VCALinkTool"
- />
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="NDEBUG"
+ MkTypLibCompatible="TRUE"
+ SuppressStartupBanner="TRUE"
+ TargetEnvironment="1"
+ TypeLibraryName=".\..\..\Build\heksedit\$(ConfigurationName)\heksedit.tlb"
+ HeaderFileName=""/>
<Tool
- Name="VCManifestTool"
- />
+ Name="VCPostBuildEventTool"/>
<Tool
- Name="VCXDCMakeTool"
- />
+ Name="VCPreBuildEventTool"/>
<Tool
- Name="VCBscMakeTool"
- />
+ Name="VCPreLinkEventTool"
+ CommandLine="PreLink.bat $(IntDir) $(TargetPath)"/>
<Tool
- Name="VCFxCopTool"
- />
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1031"/>
<Tool
- Name="VCAppVerifierTool"
- />
+ Name="VCWebServiceProxyGeneratorTool"/>
<Tool
- Name="VCPostBuildEventTool"
- />
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
@@ -408,2041 +289,1616 @@
<Files>
<Filter
Name="Source Files"
- Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
- >
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
<File
- RelativePath=".\AboutDlg.cpp"
- >
+ RelativePath=".\AboutDlg.cpp">
</File>
<File
- RelativePath="AddBmkDlg.cpp"
- >
+ RelativePath="AddBmkDlg.cpp">
<FileConfiguration
- Name="Debug|Win32"
- >
+ Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
- >
+ Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="UnicodeDebug|Win32"
- >
+ Name="UnicodeDebug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="UnicodeRelease|Win32"
- >
+ Name="UnicodeRelease|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
</File>
<File
- RelativePath=".\AnsiConvert.cpp"
- >
+ RelativePath=".\AnsiConvert.cpp">
</File>
<File
- RelativePath="AppendDlg.cpp"
- >
+ RelativePath="AppendDlg.cpp">
<FileConfiguration
- Name="Debug|Win32"
- >
+ Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
- >
+ Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="UnicodeDebug|Win32"
- >
+ Name="UnicodeDebug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="UnicodeRelease|Win32"
- >
+ Name="UnicodeRelease|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
</File>
<File
- RelativePath=".\BinaryModeDlg.cpp"
- >
+ RelativePath=".\BinaryModeDlg.cpp">
</File>
<File
- RelativePath="BinTrans.cpp"
- >
+ RelativePath="BinTrans.cpp">
<FileConfiguration
- Name="Debug|Win32"
- >
+ Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
- >
+ Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="UnicodeDebug|Win32"
- >
+ Name="UnicodeDebug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="UnicodeRelease|Win32"
- >
+ Name="UnicodeRelease|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
</File>
<File
- RelativePath="BitManipDlg.cpp"
- >
+ RelativePath="BitManipDlg.cpp">
<FileConfiguration
- Name="Debug|Win32"
- >
+ Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
- >
+ Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="UnicodeDebug|Win32"
- >
+ Name="UnicodeDebug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="UnicodeRelease|Win32"
- >
+ Name="UnicodeRelease|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
</File>
<File
- RelativePath=".\CharacterSetDlg.cpp"
- >
+ RelativePath=".\CharacterSetDlg.cpp">
</File>
<File
- RelativePath="ChooseDiffDlg.cpp"
- >
+ RelativePath="ChooseDiffDlg.cpp">
<FileConfiguration
- Name="Debug|Win32"
- >
+ Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
- >
+ Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="UnicodeDebug|Win32"
- >
+ Name="UnicodeDebug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="UnicodeRelease|Win32"
- >
+ Name="UnicodeRelease|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
</File>
<File
- RelativePath="clipboard.cpp"
- >
+ RelativePath="clipboard.cpp">
<FileConfiguration
- Name="Debug|Win32"
- >
+ Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
- >
+ Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="UnicodeDebug|Win32"
- >
+ Name="UnicodeDebug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="UnicodeRelease|Win32"
- >
+ Name="UnicodeRelease|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
</File>
<File
- RelativePath="CopyDlg.cpp"
- >
+ RelativePath="CopyDlg.cpp">
<FileConfiguration
- Name="Debug|Win32"
- >
+ Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
- >
+ Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="UnicodeDebug|Win32"
- >
+ Name="UnicodeDebug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="UnicodeRelease|Win32"
- >
+ Name="UnicodeRelease|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
</File>
<File
- RelativePath="CopyHexdumpDlg.cpp"
- >
+ RelativePath="CopyHexdumpDlg.cpp">
<FileConfiguration
- Name="Debug|Win32"
- >
+ Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
- >
+ Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="UnicodeDebug|Win32"
- >
+ Name="UnicodeDebug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="UnicodeRelease|Win32"
- >
+ Name="UnicodeRelease|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
</File>
<File
- RelativePath="CutDlg.cpp"
- >
+ RelativePath="CutDlg.cpp">
<FileConfiguration
- Name="Debug|Win32"
- >
+ Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
- >
+ Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="UnicodeDebug|Win32"
- >
+ Name="UnicodeDebug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="UnicodeRelease|Win32"
- >
+ Name="UnicodeRelease|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
</File>
<File
- RelativePath="dllmain.cpp"
- >
+ RelativePath="dllmain.cpp">
<FileConfiguration
- Name="Debug|Win32"
- >
+ Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
- >
+ Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="UnicodeDebug|Win32"
- >
+ Name="UnicodeDebug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="UnicodeRelease|Win32"
- >
+ Name="UnicodeRelease|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
</File>
<File
- RelativePath=".\DllProxies.cpp"
- >
+ RelativePath=".\DllProxies.cpp">
</File>
<File
- RelativePath="EnterDecimalValueDlg.cpp"
- >
+ RelativePath="EnterDecimalValueDlg.cpp">
<FileConfiguration
- Name="Debug|Win32"
- >
+ Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
- >
+ Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="UnicodeDebug|Win32"
- >
+ Name="UnicodeDebug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="UnicodeRelease|Win32"
- >
+ Name="UnicodeRelease|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
</File>
<File
- RelativePath="FillWithDlg.cpp"
- >
+ RelativePath="FillWithDlg.cpp">
<FileConfiguration
- Name="Debug|Win32"
- >
+ Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
- >
+ Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="UnicodeDebug|Win32"
- >
+ Name="UnicodeDebug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="UnicodeRelease|Win32"
- >
+ Name="UnicodeRelease|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
</File>
<File
- RelativePath="FindDlg.cpp"
- >
+ RelativePath="FindDlg.cpp">
<FileConfiguration
- Name="Debug|Win32"
- >
+ Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
- >
+ Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="UnicodeDebug|Win32"
- >
+ Name="UnicodeDebug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="UnicodeRelease|Win32"
- >
+ Name="UnicodeRelease|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
</File>
<File
- RelativePath="gktools.cpp"
- >
+ RelativePath="gktools.cpp">
<FileConfiguration
- Name="Debug|Win32"
- >
+ Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
- >
+ Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="UnicodeDebug|Win32"
- >
+ Name="UnicodeDebug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="UnicodeRelease|Win32"
- >
+ Name="UnicodeRelease|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
</File>
<File
- RelativePath="GoToDlg.cpp"
- >
+ RelativePath="GoToDlg.cpp">
<FileConfiguration
- Name="Debug|Win32"
- >
+ Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
- >
+ Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="UnicodeDebug|Win32"
- >
+ Name="UnicodeDebug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="UnicodeRelease|Win32"
- >
+ Name="UnicodeRelease|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
</File>
<File
- RelativePath="gtools.cpp"
- >
+ RelativePath="gtools.cpp">
<FileConfiguration
- Name="Debug|Win32"
- >
+ Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
- >
+ Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="UnicodeDebug|Win32"
- >
+ Name="UnicodeDebug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="UnicodeRelease|Win32"
- >
+ Name="UnicodeRelease|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
</File>
<File
- RelativePath="hexwdlg.cpp"
- >
+ RelativePath="hexwdlg.cpp">
<FileConfiguration
- Name="Debug|Win32"
- >
+ Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
- >
+ Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="UnicodeDebug|Win32"
- >
+ Name="UnicodeDebug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="UnicodeRelease|Win32"
- >
+ Name="UnicodeRelease|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
</File>
<File
- RelativePath="hexwnd.cpp"
- >
+ RelativePath="hexwnd.cpp">
<FileConfiguration
- Name="Debug|Win32"
- >
+ Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
- >
+ Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="UnicodeDebug|Win32"
- >
+ Name="UnicodeDebug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="UnicodeRelease|Win32"
- >
+ Name="UnicodeRelease|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
</File>
<File
- RelativePath="hgstream.cpp"
- >
+ RelativePath="hgstream.cpp">
<FileConfiguration
- Name="Debug|Win32"
- >
+ Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
- >
+ Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="UnicodeDebug|Win32"
- >
+ Name="UnicodeDebug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="UnicodeRelease|Win32"
- >
+ Name="UnicodeRelease|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
</File>
<File
- RelativePath="ido.cpp"
- >
+ RelativePath="ido.cpp">
<FileConfiguration
- Name="Debug|Win32"
- >
+ Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
- >
+ Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="UnicodeDebug|Win32"
- >
+ Name="UnicodeDebug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="UnicodeRelease|Win32"
- >
+ Name="UnicodeRelease|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
</File>
<File
- RelativePath="ids.cpp"
- >
+ RelativePath="ids.cpp">
<FileConfiguration
- Name="Debug|Win32"
- >
+ Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
- >
+ Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="UnicodeDebug|Win32"
- >
+ Name="UnicodeDebug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="UnicodeRelease|Win32"
- >
+ Name="UnicodeRelease|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
</File>
<File
- RelativePath="idt.cpp"
- >
+ RelativePath="idt.cpp">
<FileConfiguration
- Name="Debug|Win32"
- >
+ Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
- >
+ Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="UnicodeDebug|Win32"
- >
+ Name="UnicodeDebug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="UnicodeRelease|Win32"
- >
+ Name="UnicodeRelease|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
</File>
<File
- RelativePath="InvokeHtmlHelp.cpp"
- >
+ RelativePath="InvokeHtmlHelp.cpp">
<FileConfiguration
- Name="Debug|Win32"
- >
+ Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
- >
+ Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="UnicodeDebug|Win32"
- >
+ Name="UnicodeDebug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="UnicodeRelease|Win32"
- >
+ Name="UnicodeRelease|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
</File>
<File
- RelativePath=".\LangArray.cpp"
- >
+ RelativePath=".\LangArray.cpp">
</File>
<File
- RelativePath=".\LangTools.cpp"
- >
+ RelativePath=".\LangTools.cpp">
</File>
<File
- RelativePath="LoadHexFile.cpp"
- >
+ RelativePath="LoadHexFile.cpp">
<FileConfiguration
- Name="Debug|Win32"
- >
+ Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
- >
+ Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="UnicodeDebug|Win32"
- >
+ Name="UnicodeDebug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="UnicodeRelease|Win32"
- >
+ Name="UnicodeRelease|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
</File>
<File
- RelativePath="MoveCopyDlg.cpp"
- >
+ RelativePath="MoveCopyDlg.cpp">
<FileConfiguration
- Name="Debug|Win32"
- >
+ Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
- >
+ Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="UnicodeDebug|Win32"
- >
+ Name="UnicodeDebug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="UnicodeRelease|Win32"
- >
+ Name="UnicodeRelease|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
</File>
<File
- RelativePath="OpenPartiallyDlg.cpp"
- >
+ RelativePath="OpenPartiallyDlg.cpp">
<FileConfiguration
- Name="Debug|Win32"
- >
+ Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
- >
+ Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="UnicodeDebug|Win32"
- >
+ Name="UnicodeDebug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="UnicodeRelease|Win32"
- >
+ Name="UnicodeRelease|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
</File>
<File
- RelativePath="PasteDlg.cpp"
- >
+ RelativePath="PasteDlg.cpp">
<FileConfiguration
- Name="Debug|Win32"
- >
+ Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
- >
+ Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="UnicodeDebug|Win32"
- >
+ Name="UnicodeDebug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="UnicodeRelease|Win32"
- >
+ Name="UnicodeRelease|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
</File>
<File
- RelativePath="PDrive95.cpp"
- >
+ RelativePath="PDrive95.cpp">
<FileConfiguration
- Name="Debug|Win32"
- >
+ Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
- >
+ Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="UnicodeDebug|Win32"
- >
+ Name="UnicodeDebug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="UnicodeRelease|Win32"
- >
+ Name="UnicodeRelease|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
</File>
<File
- RelativePath="PDriveNT.cpp"
- >
+ RelativePath="PDriveNT.cpp">
<FileConfiguration
- Name="Debug|Win32"
- >
+ Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
- >
+ Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="UnicodeDebug|Win32"
- >
+ Name="UnicodeDebug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="UnicodeRelease|Win32"
- >
+ Name="UnicodeRelease|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
</File>
<File
- RelativePath="PhysicalDrive.cpp"
- >
+ RelativePath="PhysicalDrive.cpp">
<FileConfiguration
- Name="Debug|Win32"
- >
+ Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
- >
+ Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="UnicodeDebug|Win32"
- >
+ Name="UnicodeDebug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="UnicodeRelease|Win32"
- >
+ Name="UnicodeRelease|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
</File>
<File
- RelativePath="PMemoryBlock.cpp"
- >
+ RelativePath="PMemoryBlock.cpp">
<FileConfiguration
- Name="Debug|Win32"
- >
+ Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
- >
+ Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="UnicodeDebug|Win32"
- >
+ Name="UnicodeDebug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="UnicodeRelease|Win32"
- >
+ Name="UnicodeRelease|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
</File>
<File
- RelativePath="precomp.cpp"
- >
+ RelativePath="precomp.cpp">
<FileConfiguration
- Name="Debug|Win32"
- >
+ Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
UsePrecompiledHeader="1"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
- >
+ Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
UsePrecompiledHeader="1"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="UnicodeDebug|Win32"
- >
+ Name="UnicodeDebug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
UsePrecompiledHeader="1"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="UnicodeRelease|Win32"
- >
+ Name="UnicodeRelease|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
UsePrecompiledHeader="1"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
</File>
<File
- RelativePath=".\Registry.cpp"
- >
+ RelativePath=".\Registry.cpp">
</File>
<File
- RelativePath="regtools.cpp"
- >
+ RelativePath="regtools.cpp">
<FileConfiguration
- Name="Debug|Win32"
- >
+ Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32"
- >
+ Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"
- />
+ BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
- Name="Unic...
[truncated message content] |
|
From: <ki...@us...> - 2010-10-28 15:31:15
|
Revision: 7378
http://winmerge.svn.sourceforge.net/winmerge/?rev=7378&view=rev
Author: kimmov
Date: 2010-10-28 15:31:08 +0000 (Thu, 28 Oct 2010)
Log Message:
-----------
Fix copying compiled pcre files.
Modified Paths:
--------------
branches/R2_14/Src/PreLink.bat
Modified: branches/R2_14/Src/PreLink.bat
===================================================================
--- branches/R2_14/Src/PreLink.bat 2010-10-28 15:04:59 UTC (rev 7377)
+++ branches/R2_14/Src/PreLink.bat 2010-10-28 15:31:08 UTC (rev 7378)
@@ -134,10 +134,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
@@ -164,10 +162,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...> - 2010-10-28 15:05:09
|
Revision: 7377
http://winmerge.svn.sourceforge.net/winmerge/?rev=7377&view=rev
Author: kimmov
Date: 2010-10-28 15:04:59 +0000 (Thu, 28 Oct 2010)
Log Message:
-----------
Upgrade PCRE to version 8.10.
Modified Paths:
--------------
branches/R2_14/Externals/heksedit/heksedit.vcproj
branches/R2_14/Externals/pcre/132html
branches/R2_14/Externals/pcre/AUTHORS
branches/R2_14/Externals/pcre/CMakeLists.txt
branches/R2_14/Externals/pcre/ChangeLog
branches/R2_14/Externals/pcre/HACKING
branches/R2_14/Externals/pcre/INSTALL
branches/R2_14/Externals/pcre/LICENCE
branches/R2_14/Externals/pcre/Makefile.am
branches/R2_14/Externals/pcre/Makefile.in
branches/R2_14/Externals/pcre/NEWS
branches/R2_14/Externals/pcre/NON-UNIX-USE
branches/R2_14/Externals/pcre/PrepareRelease
branches/R2_14/Externals/pcre/README
branches/R2_14/Externals/pcre/RunGrepTest
branches/R2_14/Externals/pcre/RunTest
branches/R2_14/Externals/pcre/RunTest.bat
branches/R2_14/Externals/pcre/Win32/ALL_BUILD.vcproj
branches/R2_14/Externals/pcre/Win32/CMakeCache.txt
branches/R2_14/Externals/pcre/Win32/CMakeFiles/CMakeCCompiler.cmake
branches/R2_14/Externals/pcre/Win32/CMakeFiles/CMakeCPlatform.cmake
branches/R2_14/Externals/pcre/Win32/CMakeFiles/CMakeCXXCompiler.cmake
branches/R2_14/Externals/pcre/Win32/CMakeFiles/CMakeCXXPlatform.cmake
branches/R2_14/Externals/pcre/Win32/CMakeFiles/CMakeDetermineCompilerABI_C.bin
branches/R2_14/Externals/pcre/Win32/CMakeFiles/CMakeDetermineCompilerABI_CXX.bin
branches/R2_14/Externals/pcre/Win32/CMakeFiles/CMakeRCCompiler.cmake
branches/R2_14/Externals/pcre/Win32/CMakeFiles/CMakeSystem.cmake
branches/R2_14/Externals/pcre/Win32/CMakeFiles/CheckTypeSize.bin
branches/R2_14/Externals/pcre/Win32/CMakeFiles/generate.stamp.depend
branches/R2_14/Externals/pcre/Win32/CTestCustom.ctest
branches/R2_14/Externals/pcre/Win32/CTestTestfile.cmake
branches/R2_14/Externals/pcre/Win32/INSTALL.vcproj
branches/R2_14/Externals/pcre/Win32/RUN_TESTS.vcproj
branches/R2_14/Externals/pcre/Win32/cmake_install.cmake
branches/R2_14/Externals/pcre/Win32/pcre.h
branches/R2_14/Externals/pcre/Win32/pcre.vcproj
branches/R2_14/Externals/pcre/Win32/pcreX64.vcproj
branches/R2_14/Externals/pcre/Win32/pcre_chartables.c
branches/R2_14/Externals/pcre/Win32/pcre_scanner_unittest.vcproj
branches/R2_14/Externals/pcre/Win32/pcre_stringpiece_unittest.vcproj
branches/R2_14/Externals/pcre/Win32/pcrecpp.vcproj
branches/R2_14/Externals/pcre/Win32/pcrecpp_unittest.vcproj
branches/R2_14/Externals/pcre/Win32/pcregrep.vcproj
branches/R2_14/Externals/pcre/Win32/pcreposix.vcproj
branches/R2_14/Externals/pcre/Win32/pcretest.vcproj
branches/R2_14/Externals/pcre/aclocal.m4
branches/R2_14/Externals/pcre/config.guess
branches/R2_14/Externals/pcre/config.h.generic
branches/R2_14/Externals/pcre/config.h.in
branches/R2_14/Externals/pcre/config.sub
branches/R2_14/Externals/pcre/configure
branches/R2_14/Externals/pcre/configure.ac
branches/R2_14/Externals/pcre/depcomp
branches/R2_14/Externals/pcre/doc/html/index.html
branches/R2_14/Externals/pcre/doc/html/pcre.html
branches/R2_14/Externals/pcre/doc/html/pcre_compile.html
branches/R2_14/Externals/pcre/doc/html/pcre_compile2.html
branches/R2_14/Externals/pcre/doc/html/pcre_dfa_exec.html
branches/R2_14/Externals/pcre/doc/html/pcre_exec.html
branches/R2_14/Externals/pcre/doc/html/pcre_fullinfo.html
branches/R2_14/Externals/pcre/doc/html/pcreapi.html
branches/R2_14/Externals/pcre/doc/html/pcrebuild.html
branches/R2_14/Externals/pcre/doc/html/pcrecallout.html
branches/R2_14/Externals/pcre/doc/html/pcrecompat.html
branches/R2_14/Externals/pcre/doc/html/pcrecpp.html
branches/R2_14/Externals/pcre/doc/html/pcregrep.html
branches/R2_14/Externals/pcre/doc/html/pcrematching.html
branches/R2_14/Externals/pcre/doc/html/pcrepartial.html
branches/R2_14/Externals/pcre/doc/html/pcrepattern.html
branches/R2_14/Externals/pcre/doc/html/pcreperform.html
branches/R2_14/Externals/pcre/doc/html/pcreposix.html
branches/R2_14/Externals/pcre/doc/html/pcresample.html
branches/R2_14/Externals/pcre/doc/html/pcrestack.html
branches/R2_14/Externals/pcre/doc/html/pcresyntax.html
branches/R2_14/Externals/pcre/doc/html/pcretest.html
branches/R2_14/Externals/pcre/doc/index.html.src
branches/R2_14/Externals/pcre/doc/pcre.3
branches/R2_14/Externals/pcre/doc/pcre.txt
branches/R2_14/Externals/pcre/doc/pcre_compile.3
branches/R2_14/Externals/pcre/doc/pcre_compile2.3
branches/R2_14/Externals/pcre/doc/pcre_dfa_exec.3
branches/R2_14/Externals/pcre/doc/pcre_exec.3
branches/R2_14/Externals/pcre/doc/pcre_fullinfo.3
branches/R2_14/Externals/pcre/doc/pcreapi.3
branches/R2_14/Externals/pcre/doc/pcrebuild.3
branches/R2_14/Externals/pcre/doc/pcrecallout.3
branches/R2_14/Externals/pcre/doc/pcrecompat.3
branches/R2_14/Externals/pcre/doc/pcrecpp.3
branches/R2_14/Externals/pcre/doc/pcregrep.1
branches/R2_14/Externals/pcre/doc/pcregrep.txt
branches/R2_14/Externals/pcre/doc/pcrematching.3
branches/R2_14/Externals/pcre/doc/pcrepartial.3
branches/R2_14/Externals/pcre/doc/pcrepattern.3
branches/R2_14/Externals/pcre/doc/pcreperform.3
branches/R2_14/Externals/pcre/doc/pcreposix.3
branches/R2_14/Externals/pcre/doc/pcresample.3
branches/R2_14/Externals/pcre/doc/pcrestack.3
branches/R2_14/Externals/pcre/doc/pcresyntax.3
branches/R2_14/Externals/pcre/doc/pcretest.1
branches/R2_14/Externals/pcre/doc/pcretest.txt
branches/R2_14/Externals/pcre/doc/perltest.txt
branches/R2_14/Externals/pcre/install-sh
branches/R2_14/Externals/pcre/libpcre.pc.in
branches/R2_14/Externals/pcre/libpcrecpp.pc.in
branches/R2_14/Externals/pcre/ltmain.sh
branches/R2_14/Externals/pcre/missing
branches/R2_14/Externals/pcre/pcre-config.in
branches/R2_14/Externals/pcre/pcre.h.generic
branches/R2_14/Externals/pcre/pcre.h.in
branches/R2_14/Externals/pcre/pcre_chartables.c.dist
branches/R2_14/Externals/pcre/pcre_compile.c
branches/R2_14/Externals/pcre/pcre_config.c
branches/R2_14/Externals/pcre/pcre_dfa_exec.c
branches/R2_14/Externals/pcre/pcre_exec.c
branches/R2_14/Externals/pcre/pcre_fullinfo.c
branches/R2_14/Externals/pcre/pcre_globals.c
branches/R2_14/Externals/pcre/pcre_info.c
branches/R2_14/Externals/pcre/pcre_internal.h
branches/R2_14/Externals/pcre/pcre_newline.c
branches/R2_14/Externals/pcre/pcre_printint.src
branches/R2_14/Externals/pcre/pcre_scanner.cc
branches/R2_14/Externals/pcre/pcre_scanner_unittest.cc
branches/R2_14/Externals/pcre/pcre_study.c
branches/R2_14/Externals/pcre/pcre_tables.c
branches/R2_14/Externals/pcre/pcre_try_flipped.c
branches/R2_14/Externals/pcre/pcre_ucd.c
branches/R2_14/Externals/pcre/pcre_valid_utf8.c
branches/R2_14/Externals/pcre/pcre_xclass.c
branches/R2_14/Externals/pcre/pcrecpp.cc
branches/R2_14/Externals/pcre/pcrecpp.h
branches/R2_14/Externals/pcre/pcrecpp_unittest.cc
branches/R2_14/Externals/pcre/pcredemo.c
branches/R2_14/Externals/pcre/pcregexp.pas
branches/R2_14/Externals/pcre/pcregrep.c
branches/R2_14/Externals/pcre/pcreposix.c
branches/R2_14/Externals/pcre/pcreposix.h
branches/R2_14/Externals/pcre/pcretest.c
branches/R2_14/Externals/pcre/perltest.pl
branches/R2_14/Externals/pcre/testdata/grepinputv
branches/R2_14/Externals/pcre/testdata/grepinputx
branches/R2_14/Externals/pcre/testdata/grepoutput
branches/R2_14/Externals/pcre/testdata/testinput1
branches/R2_14/Externals/pcre/testdata/testinput10
branches/R2_14/Externals/pcre/testdata/testinput2
branches/R2_14/Externals/pcre/testdata/testinput3
branches/R2_14/Externals/pcre/testdata/testinput4
branches/R2_14/Externals/pcre/testdata/testinput5
branches/R2_14/Externals/pcre/testdata/testinput6
branches/R2_14/Externals/pcre/testdata/testinput7
branches/R2_14/Externals/pcre/testdata/testinput8
branches/R2_14/Externals/pcre/testdata/testinput9
branches/R2_14/Externals/pcre/testdata/testoutput1
branches/R2_14/Externals/pcre/testdata/testoutput10
branches/R2_14/Externals/pcre/testdata/testoutput2
branches/R2_14/Externals/pcre/testdata/testoutput3
branches/R2_14/Externals/pcre/testdata/testoutput4
branches/R2_14/Externals/pcre/testdata/testoutput5
branches/R2_14/Externals/pcre/testdata/testoutput6
branches/R2_14/Externals/pcre/testdata/testoutput7
branches/R2_14/Externals/pcre/testdata/testoutput8
branches/R2_14/Externals/pcre/testdata/testoutput9
branches/R2_14/Externals/pcre/testdata/wintestoutput3
branches/R2_14/Externals/pcre/ucp.h
branches/R2_14/Externals/versions.txt
Added Paths:
-----------
branches/R2_14/Externals/pcre/Win32/CMakeFiles/TargetDirectories.txt
branches/R2_14/Externals/pcre/Win32/CMakeFiles/ZERO_CHECK.rule
branches/R2_14/Externals/pcre/Win32/CMakeFiles/generate.stamp.list
branches/R2_14/Externals/pcre/Win32/ZERO_CHECK.vcproj
branches/R2_14/Externals/pcre/doc/html/pcredemo.html
branches/R2_14/Externals/pcre/libpcreposix.pc.in
branches/R2_14/Externals/pcre/testdata/testinput11
branches/R2_14/Externals/pcre/testdata/testinput12
branches/R2_14/Externals/pcre/testdata/testoutput11
branches/R2_14/Externals/pcre/testdata/testoutput12
Removed Paths:
-------------
branches/R2_14/Externals/pcre/Win32/PCRE.sln
branches/R2_14/Externals/pcre/Win32/PCRE_fullsolution.sln
branches/R2_14/Externals/pcre/Win32/pcre.dsp
Modified: branches/R2_14/Externals/heksedit/heksedit.vcproj
===================================================================
--- branches/R2_14/Externals/heksedit/heksedit.vcproj 2010-10-28 14:35:21 UTC (rev 7376)
+++ branches/R2_14/Externals/heksedit/heksedit.vcproj 2010-10-28 15:04:59 UTC (rev 7377)
@@ -1,32 +1,58 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="7.10"
+ Version="9.00"
Name="heksedit"
ProjectGUID="{15EE10B9-011A-4781-ACBC-22F1CFEB5610}"
- SccProjectName=""
- SccLocalPath="">
+ TargetFrameworkVersion="131072"
+ >
<Platforms>
<Platform
- Name="Win32"/>
+ Name="Win32"
+ />
</Platforms>
+ <ToolFiles>
+ </ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory=".\..\..\Build\heksedit\$(ConfigurationName)"
IntermediateDirectory=".\..\..\BuildTmp\heksedit\$(ConfigurationName)"
ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE">
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ >
<Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="_DEBUG"
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="1"
+ TypeLibraryName=".\..\..\Build\heksedit\$(ConfigurationName)\heksedit.tlb"
+ HeaderFileName=""
+ />
+ <Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- StringPooling="TRUE"
- ExceptionHandling="FALSE"
+ StringPooling="true"
+ ExceptionHandling="0"
RuntimeLibrary="3"
- UsePrecompiledHeader="3"
+ UsePrecompiledHeader="2"
PrecompiledHeaderThrough="precomp.h"
PrecompiledHeaderFile=".\..\..\BuildTmp\heksedit\$(ConfigurationName)\heksedit.pch"
AssemblerListingLocation=".\..\..\BuildTmp\heksedit\$(ConfigurationName)\"
@@ -34,68 +60,97 @@
ProgramDataBaseFileName=".\..\..\BuildTmp\heksedit\$(ConfigurationName)\"
BrowseInformation="1"
WarningLevel="3"
- SuppressStartupBanner="TRUE"
- DebugInformationFormat="1"/>
+ SuppressStartupBanner="true"
+ DebugInformationFormat="1"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1031"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ CommandLine="PreLink.bat $(IntDir) $(TargetPath)"
+ />
+ <Tool
Name="VCLinkerTool"
AdditionalDependencies="version.lib comctl32.lib wininet.lib shlwapi.lib htmlhelp.lib"
OutputFile="..\..\Build\heksedit\Debug\heksedit.dll"
LinkIncremental="1"
- SuppressStartupBanner="TRUE"
+ SuppressStartupBanner="true"
AdditionalLibraryDirectories=""
- GenerateDebugInformation="TRUE"
+ GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\Build\heksedit\$(ConfigurationName)\heksedit.pdb"
SubSystem="2"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
ImportLibrary=".\..\..\Build\heksedit\$(ConfigurationName)\heksedit.lib"
- TargetMachine="1"/>
+ TargetMachine="1"
+ />
<Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG"
- MkTypLibCompatible="TRUE"
- SuppressStartupBanner="TRUE"
- TargetEnvironment="1"
- TypeLibraryName=".\..\..\Build\heksedit\$(ConfigurationName)\heksedit.tlb"
- HeaderFileName=""/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManifestTool"
+ />
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCPreLinkEventTool"
- CommandLine="PreLink.bat $(IntDir) $(TargetPath)"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1031"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCAppVerifierTool"
+ />
<Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory=".\..\..\Build\heksedit\$(ConfigurationName)"
IntermediateDirectory=".\..\..\BuildTmp\heksedit\$(ConfigurationName)"
ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE">
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ >
<Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="NDEBUG"
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="1"
+ TypeLibraryName=".\..\..\Build\heksedit\$(ConfigurationName)\heksedit.tlb"
+ HeaderFileName=""
+ />
+ <Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- StringPooling="TRUE"
- ExceptionHandling="FALSE"
+ StringPooling="true"
+ ExceptionHandling="0"
RuntimeLibrary="2"
- UsePrecompiledHeader="3"
+ UsePrecompiledHeader="2"
PrecompiledHeaderThrough="precomp.h"
PrecompiledHeaderFile=".\..\..\BuildTmp\heksedit\$(ConfigurationName)\heksedit.pch"
AssemblerListingLocation=".\..\..\BuildTmp\heksedit\$(ConfigurationName)\"
@@ -103,66 +158,95 @@
ProgramDataBaseFileName=".\..\..\BuildTmp\heksedit\$(ConfigurationName)\"
BrowseInformation="1"
WarningLevel="3"
- SuppressStartupBanner="TRUE"/>
+ SuppressStartupBanner="true"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1031"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ CommandLine="PreLink.bat $(IntDir) $(TargetPath)"
+ />
+ <Tool
Name="VCLinkerTool"
AdditionalDependencies="version.lib comctl32.lib wininet.lib shlwapi.lib htmlhelp.lib"
OutputFile="..\..\Build\heksedit\$(ConfigurationName)\heksedit.dll"
LinkIncremental="1"
- SuppressStartupBanner="TRUE"
+ SuppressStartupBanner="true"
AdditionalLibraryDirectories=""
ProgramDatabaseFile="..\..\Build\heksedit\$(ConfigurationName)\heksedit.pdb"
SubSystem="2"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
ImportLibrary=".\..\..\Build\heksedit\$(ConfigurationName)\heksedit.lib"
- TargetMachine="1"/>
+ TargetMachine="1"
+ />
<Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
- MkTypLibCompatible="TRUE"
- SuppressStartupBanner="TRUE"
- TargetEnvironment="1"
- TypeLibraryName=".\..\..\Build\heksedit\$(ConfigurationName)\heksedit.tlb"
- HeaderFileName=""/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManifestTool"
+ />
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCPreLinkEventTool"
- CommandLine="PreLink.bat $(IntDir) $(TargetPath)"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1031"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCAppVerifierTool"
+ />
<Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
<Configuration
Name="UnicodeDebug|Win32"
OutputDirectory=".\..\..\Build\heksedit\$(ConfigurationName)"
IntermediateDirectory=".\..\..\BuildTmp\heksedit\$(ConfigurationName)"
ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE">
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ >
<Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="_DEBUG"
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="1"
+ TypeLibraryName=".\..\..\Build\heksedit\$(ConfigurationName)\heksedit.tlb"
+ HeaderFileName=""
+ />
+ <Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;UNICODE;_UNICODE"
- StringPooling="TRUE"
- ExceptionHandling="FALSE"
+ StringPooling="true"
+ ExceptionHandling="0"
RuntimeLibrary="3"
- UsePrecompiledHeader="3"
+ UsePrecompiledHeader="2"
PrecompiledHeaderThrough="precomp.h"
PrecompiledHeaderFile=".\..\..\BuildTmp\heksedit\$(ConfigurationName)\heksedit.pch"
AssemblerListingLocation=".\..\..\BuildTmp\heksedit\$(ConfigurationName)\"
@@ -170,68 +254,97 @@
ProgramDataBaseFileName=".\..\..\BuildTmp\heksedit\$(ConfigurationName)\"
BrowseInformation="1"
WarningLevel="3"
- SuppressStartupBanner="TRUE"
- DebugInformationFormat="1"/>
+ SuppressStartupBanner="true"
+ DebugInformationFormat="1"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1031"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ CommandLine="PreLink.bat $(IntDir) $(TargetPath)"
+ />
+ <Tool
Name="VCLinkerTool"
AdditionalDependencies="version.lib comctl32.lib wininet.lib shlwapi.lib htmlhelp.lib"
OutputFile="..\..\Build\heksedit\Debug\hekseditU.dll"
LinkIncremental="1"
- SuppressStartupBanner="TRUE"
+ SuppressStartupBanner="true"
AdditionalLibraryDirectories=""
- GenerateDebugInformation="TRUE"
+ GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\Build\heksedit\$(ConfigurationName)\heksedit.pdb"
SubSystem="2"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
ImportLibrary=".\..\..\Build\heksedit\$(ConfigurationName)\heksedit.lib"
- TargetMachine="1"/>
+ TargetMachine="1"
+ />
<Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG"
- MkTypLibCompatible="TRUE"
- SuppressStartupBanner="TRUE"
- TargetEnvironment="1"
- TypeLibraryName=".\..\..\Build\heksedit\$(ConfigurationName)\heksedit.tlb"
- HeaderFileName=""/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManifestTool"
+ />
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCPreLinkEventTool"
- CommandLine="PreLink.bat $(IntDir) $(TargetPath)"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1031"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCAppVerifierTool"
+ />
<Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
<Configuration
Name="UnicodeRelease|Win32"
OutputDirectory=".\..\..\Build\heksedit\$(ConfigurationName)"
IntermediateDirectory=".\..\..\BuildTmp\heksedit\$(ConfigurationName)"
ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE">
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ >
<Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="NDEBUG"
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="1"
+ TypeLibraryName=".\..\..\Build\heksedit\$(ConfigurationName)\heksedit.tlb"
+ HeaderFileName=""
+ />
+ <Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;UNICODE;_UNICODE"
- StringPooling="TRUE"
- ExceptionHandling="FALSE"
+ StringPooling="true"
+ ExceptionHandling="0"
RuntimeLibrary="2"
- UsePrecompiledHeader="3"
+ UsePrecompiledHeader="2"
PrecompiledHeaderThrough="precomp.h"
PrecompiledHeaderFile=".\..\..\BuildTmp\heksedit\$(ConfigurationName)\heksedit.pch"
AssemblerListingLocation=".\..\..\BuildTmp\heksedit\$(ConfigurationName)\"
@@ -239,49 +352,55 @@
ProgramDataBaseFileName=".\..\..\BuildTmp\heksedit\$(ConfigurationName)\"
BrowseInformation="1"
WarningLevel="3"
- SuppressStartupBanner="TRUE"/>
+ SuppressStartupBanner="true"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1031"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ CommandLine="PreLink.bat $(IntDir) $(TargetPath)"
+ />
+ <Tool
Name="VCLinkerTool"
AdditionalDependencies="version.lib comctl32.lib wininet.lib shlwapi.lib htmlhelp.lib"
OutputFile="..\..\Build\heksedit\Release\hekseditU.dll"
LinkIncremental="1"
- SuppressStartupBanner="TRUE"
+ SuppressStartupBanner="true"
AdditionalLibraryDirectories=""
ProgramDatabaseFile="..\..\Build\heksedit\$(ConfigurationName)\heksedit.pdb"
SubSystem="2"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
ImportLibrary=".\..\..\Build\heksedit\$(ConfigurationName)\heksedit.lib"
- TargetMachine="1"/>
+ TargetMachine="1"
+ />
<Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
- MkTypLibCompatible="TRUE"
- SuppressStartupBanner="TRUE"
- TargetEnvironment="1"
- TypeLibraryName=".\..\..\Build\heksedit\$(ConfigurationName)\heksedit.tlb"
- HeaderFileName=""/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManifestTool"
+ />
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCPreLinkEventTool"
- CommandLine="PreLink.bat $(IntDir) $(TargetPath)"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1031"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCAppVerifierTool"
+ />
<Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
</Configurations>
<References>
@@ -289,1616 +408,2041 @@
<Files>
<Filter
Name="Source Files"
- Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
<File
- RelativePath=".\AboutDlg.cpp">
+ RelativePath=".\AboutDlg.cpp"
+ >
</File>
<File
- RelativePath="AddBmkDlg.cpp">
+ RelativePath="AddBmkDlg.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="UnicodeDebug|Win32">
+ Name="UnicodeDebug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="UnicodeRelease|Win32">
+ Name="UnicodeRelease|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
</File>
<File
- RelativePath=".\AnsiConvert.cpp">
+ RelativePath=".\AnsiConvert.cpp"
+ >
</File>
<File
- RelativePath="AppendDlg.cpp">
+ RelativePath="AppendDlg.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="UnicodeDebug|Win32">
+ Name="UnicodeDebug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="UnicodeRelease|Win32">
+ Name="UnicodeRelease|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
</File>
<File
- RelativePath=".\BinaryModeDlg.cpp">
+ RelativePath=".\BinaryModeDlg.cpp"
+ >
</File>
<File
- RelativePath="BinTrans.cpp">
+ RelativePath="BinTrans.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="UnicodeDebug|Win32">
+ Name="UnicodeDebug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="UnicodeRelease|Win32">
+ Name="UnicodeRelease|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="BitManipDlg.cpp">
+ RelativePath="BitManipDlg.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="UnicodeDebug|Win32">
+ Name="UnicodeDebug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="UnicodeRelease|Win32">
+ Name="UnicodeRelease|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
</File>
<File
- RelativePath=".\CharacterSetDlg.cpp">
+ RelativePath=".\CharacterSetDlg.cpp"
+ >
</File>
<File
- RelativePath="ChooseDiffDlg.cpp">
+ RelativePath="ChooseDiffDlg.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="UnicodeDebug|Win32">
+ Name="UnicodeDebug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="UnicodeRelease|Win32">
+ Name="UnicodeRelease|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="clipboard.cpp">
+ RelativePath="clipboard.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="UnicodeDebug|Win32">
+ Name="UnicodeDebug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="UnicodeRelease|Win32">
+ Name="UnicodeRelease|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="CopyDlg.cpp">
+ RelativePath="CopyDlg.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="UnicodeDebug|Win32">
+ Name="UnicodeDebug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="UnicodeRelease|Win32">
+ Name="UnicodeRelease|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="CopyHexdumpDlg.cpp">
+ RelativePath="CopyHexdumpDlg.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="UnicodeDebug|Win32">
+ Name="UnicodeDebug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="UnicodeRelease|Win32">
+ Name="UnicodeRelease|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="CutDlg.cpp">
+ RelativePath="CutDlg.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="UnicodeDebug|Win32">
+ Name="UnicodeDebug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="UnicodeRelease|Win32">
+ Name="UnicodeRelease|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="dllmain.cpp">
+ RelativePath="dllmain.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="UnicodeDebug|Win32">
+ Name="UnicodeDebug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="UnicodeRelease|Win32">
+ Name="UnicodeRelease|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
</File>
<File
- RelativePath=".\DllProxies.cpp">
+ RelativePath=".\DllProxies.cpp"
+ >
</File>
<File
- RelativePath="EnterDecimalValueDlg.cpp">
+ RelativePath="EnterDecimalValueDlg.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="UnicodeDebug|Win32">
+ Name="UnicodeDebug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="UnicodeRelease|Win32">
+ Name="UnicodeRelease|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="FillWithDlg.cpp">
+ RelativePath="FillWithDlg.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="UnicodeDebug|Win32">
+ Name="UnicodeDebug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="UnicodeRelease|Win32">
+ Name="UnicodeRelease|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="FindDlg.cpp">
+ RelativePath="FindDlg.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="UnicodeDebug|Win32">
+ Name="UnicodeDebug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="UnicodeRelease|Win32">
+ Name="UnicodeRelease|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="gktools.cpp">
+ RelativePath="gktools.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="UnicodeDebug|Win32">
+ Name="UnicodeDebug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="UnicodeRelease|Win32">
+ Name="UnicodeRelease|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="GoToDlg.cpp">
+ RelativePath="GoToDlg.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="UnicodeDebug|Win32">
+ Name="UnicodeDebug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="UnicodeRelease|Win32">
+ Name="UnicodeRelease|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="gtools.cpp">
+ RelativePath="gtools.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="UnicodeDebug|Win32">
+ Name="UnicodeDebug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="UnicodeRelease|Win32">
+ Name="UnicodeRelease|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="hexwdlg.cpp">
+ RelativePath="hexwdlg.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="UnicodeDebug|Win32">
+ Name="UnicodeDebug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="UnicodeRelease|Win32">
+ Name="UnicodeRelease|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="hexwnd.cpp">
+ RelativePath="hexwnd.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="UnicodeDebug|Win32">
+ Name="UnicodeDebug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="UnicodeRelease|Win32">
+ Name="UnicodeRelease|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="hgstream.cpp">
+ RelativePath="hgstream.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="UnicodeDebug|Win32">
+ Name="UnicodeDebug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="UnicodeRelease|Win32">
+ Name="UnicodeRelease|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="ido.cpp">
+ RelativePath="ido.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="UnicodeDebug|Win32">
+ Name="UnicodeDebug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="UnicodeRelease|Win32">
+ Name="UnicodeRelease|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="ids.cpp">
+ RelativePath="ids.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="UnicodeDebug|Win32">
+ Name="UnicodeDebug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="UnicodeRelease|Win32">
+ Name="UnicodeRelease|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="idt.cpp">
+ RelativePath="idt.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="UnicodeDebug|Win32">
+ Name="UnicodeDebug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="UnicodeRelease|Win32">
+ Name="UnicodeRelease|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="InvokeHtmlHelp.cpp">
+ RelativePath="InvokeHtmlHelp.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="UnicodeDebug|Win32">
+ Name="UnicodeDebug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="UnicodeRelease|Win32">
+ Name="UnicodeRelease|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
</File>
<File
- RelativePath=".\LangArray.cpp">
+ RelativePath=".\LangArray.cpp"
+ >
</File>
<File
- RelativePath=".\LangTools.cpp">
+ RelativePath=".\LangTools.cpp"
+ >
</File>
<File
- RelativePath="LoadHexFile.cpp">
+ RelativePath="LoadHexFile.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="UnicodeDebug|Win32">
+ Name="UnicodeDebug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="UnicodeRelease|Win32">
+ Name="UnicodeRelease|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="MoveCopyDlg.cpp">
+ RelativePath="MoveCopyDlg.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="UnicodeDebug|Win32">
+ Name="UnicodeDebug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="UnicodeRelease|Win32">
+ Name="UnicodeRelease|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
</File>
<File
- RelativePath="OpenPartiallyDlg.cpp">
+ RelativePath="OpenPartiallyDlg.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
- BrowseInformation="1"/>
+ BrowseInformation="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="UnicodeDebug|Win32">
+ Name="UnicodeDebug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="_...
[truncated message content] |
|
From: <ki...@us...> - 2010-10-28 14:35:28
|
Revision: 7376
http://winmerge.svn.sourceforge.net/winmerge/?rev=7376&view=rev
Author: kimmov
Date: 2010-10-28 14:35:21 +0000 (Thu, 28 Oct 2010)
Log Message:
-----------
Fix compile after SCEW update.
Modified Paths:
--------------
branches/R2_14/Src/Merge.vcproj
branches/R2_14/Src/ProjectFile.cpp
branches/R2_14/Src/ProjectFile.h
Modified: branches/R2_14/Src/Merge.vcproj
===================================================================
--- branches/R2_14/Src/Merge.vcproj 2010-10-27 21:24:57 UTC (rev 7375)
+++ branches/R2_14/Src/Merge.vcproj 2010-10-28 14:35:21 UTC (rev 7376)
@@ -82,7 +82,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/verbose:lib"
- AdditionalDependencies="version.lib shlwapi.lib imm32.lib HtmlHelp.lib libexpat.lib pcre.lib"
+ AdditionalDependencies="version.lib shlwapi.lib imm32.lib HtmlHelp.lib libexpat.lib pcre.lib scew.lib"
OutputFile="..\Build\MergeUnicodeRelease\WinMergeU.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -187,7 +187,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="version.lib shlwapi.lib imm32.lib HtmlHelp.lib libexpat.lib pcre.lib"
+ AdditionalDependencies="version.lib shlwapi.lib imm32.lib HtmlHelp.lib libexpat.lib pcre.lib scew_d.lib"
OutputFile="..\Build\MergeUnicodeDebug/WinMergeU.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -291,7 +291,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="version.lib shlwapi.lib imm32.lib HtmlHelp.lib libexpat.lib pcre.lib"
+ AdditionalDependencies="version.lib shlwapi.lib imm32.lib HtmlHelp.lib libexpat.lib pcre.lib scew_d.lib"
OutputFile="..\Build\MergeDebug/WinMerge.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -397,7 +397,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/verbose:lib"
- AdditionalDependencies="version.lib shlwapi.lib imm32.lib HtmlHelp.lib libexpat.lib pcre.lib"
+ AdditionalDependencies="version.lib shlwapi.lib imm32.lib HtmlHelp.lib libexpat.lib pcre.lib scew.lib"
OutputFile="..\Build\MergeRelease/WinMerge.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: branches/R2_14/Src/ProjectFile.cpp
===================================================================
--- branches/R2_14/Src/ProjectFile.cpp 2010-10-27 21:24:57 UTC (rev 7375)
+++ branches/R2_14/Src/ProjectFile.cpp 2010-10-28 14:35:21 UTC (rev 7376)
@@ -19,7 +19,7 @@
*
* @brief Implementation file for ProjectFile class.
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by CVS
// $Id$
#include "stdafx.h"
@@ -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)
{
Modified: branches/R2_14/Src/ProjectFile.h
===================================================================
--- branches/R2_14/Src/ProjectFile.h 2010-10-27 21:24:57 UTC (rev 7375)
+++ branches/R2_14/Src/ProjectFile.h 2010-10-28 14:35:21 UTC (rev 7376)
@@ -19,9 +19,12 @@
*
* @brief Declaration file ProjectFile class
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by CVS
// $Id$
+#ifndef _PROJECT_FILE_H_
+#define _PROJECT_FILE_H_
+
#include <scew/scew.h>
/** @brief File extension for path files */
@@ -79,3 +82,5 @@
BOOL m_bLeftReadOnly; /**< Is left path opened as read-only */
BOOL m_bRightReadOnly; /**< Is right path opened as read-only */
};
+
+#endif // #ifdef _PROJECT_FILE_H_
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2010-10-27 21:25:07
|
Revision: 7375
http://winmerge.svn.sourceforge.net/winmerge/?rev=7375&view=rev
Author: kimmov
Date: 2010-10-27 21:24:57 +0000 (Wed, 27 Oct 2010)
Log Message:
-----------
Upgrade SCEW to version 1.1.2.
Modified Paths:
--------------
branches/R2_14/Externals/scew/AUTHORS
branches/R2_14/Externals/scew/COPYING
branches/R2_14/Externals/scew/INSTALL
branches/R2_14/Externals/scew/Makefile.am
branches/R2_14/Externals/scew/NEWS
branches/R2_14/Externals/scew/README
branches/R2_14/Externals/scew/THANKS
branches/R2_14/Externals/scew/doc/Doxyfile.in
branches/R2_14/Externals/scew/doc/Makefile.am
branches/R2_14/Externals/scew/etc/Makefile.am
branches/R2_14/Externals/scew/etc/autoconf/Makefile.am
branches/R2_14/Externals/scew/etc/autoconf/doxygen.m4
branches/R2_14/Externals/scew/etc/pkg-config/Makefile.am
branches/R2_14/Externals/scew/examples/Makefile.am
branches/R2_14/Externals/scew/examples/README
branches/R2_14/Externals/scew/examples/scew_print/Makefile.am
branches/R2_14/Externals/scew/examples/scew_print/scew_print.c
branches/R2_14/Externals/scew/examples/scew_stream/Makefile.am
branches/R2_14/Externals/scew/examples/scew_stream/scew_stream.c
branches/R2_14/Externals/scew/examples/scew_write/Makefile.am
branches/R2_14/Externals/scew/examples/scew_write/scew_write.c
branches/R2_14/Externals/scew/scew/Makefile.am
branches/R2_14/Externals/scew/scew/attribute.c
branches/R2_14/Externals/scew/scew/attribute.h
branches/R2_14/Externals/scew/scew/element.c
branches/R2_14/Externals/scew/scew/element.h
branches/R2_14/Externals/scew/scew/error.c
branches/R2_14/Externals/scew/scew/error.h
branches/R2_14/Externals/scew/scew/parser.c
branches/R2_14/Externals/scew/scew/parser.h
branches/R2_14/Externals/scew/scew/scew.h
branches/R2_14/Externals/scew/scew/str.c
branches/R2_14/Externals/scew/scew/str.h
branches/R2_14/Externals/scew/scew/tree.c
branches/R2_14/Externals/scew/scew/tree.h
branches/R2_14/Externals/scew/scew/writer.c
branches/R2_14/Externals/scew/scew/writer.h
branches/R2_14/Externals/scew/scew/xattribute.c
branches/R2_14/Externals/scew/scew/xattribute.h
branches/R2_14/Externals/scew/scew/xelement.h
branches/R2_14/Externals/scew/scew/xerror.c
branches/R2_14/Externals/scew/scew/xerror.h
branches/R2_14/Externals/scew/scew/xparser.c
branches/R2_14/Externals/scew/scew/xparser.h
branches/R2_14/Externals/scew/win32/Makefile.am
branches/R2_14/Externals/scew/win32/scew.vcproj
branches/R2_14/Externals/scew/win32/scewX64.vcproj
branches/R2_14/Externals/versions.txt
Added Paths:
-----------
branches/R2_14/Externals/scew/examples/win32/
branches/R2_14/Externals/scew/examples/win32/Makefile.am
branches/R2_14/Externals/scew/examples/win32/README.txt
branches/R2_14/Externals/scew/examples/win32/scew_examples.sln
branches/R2_14/Externals/scew/examples/win32/scew_print/
branches/R2_14/Externals/scew/examples/win32/scew_print/Makefile.am
branches/R2_14/Externals/scew/examples/win32/scew_print/scew_print.vcproj
branches/R2_14/Externals/scew/examples/win32/scew_stream/
branches/R2_14/Externals/scew/examples/win32/scew_stream/Makefile.am
branches/R2_14/Externals/scew/examples/win32/scew_stream/scew_stream.vcproj
branches/R2_14/Externals/scew/examples/win32/scew_write/
branches/R2_14/Externals/scew/examples/win32/scew_write/Makefile.am
branches/R2_14/Externals/scew/examples/win32/scew_write/scew_write.vcproj
branches/R2_14/Externals/scew/tests/
branches/R2_14/Externals/scew/tests/Makefile.am
branches/R2_14/Externals/scew/tests/check_attribute.c
branches/R2_14/Externals/scew/tests/check_element.c
branches/R2_14/Externals/scew/tests/check_list.c
branches/R2_14/Externals/scew/tests/check_parser.c
branches/R2_14/Externals/scew/tests/check_printer.c
branches/R2_14/Externals/scew/tests/check_reader_buffer.c
branches/R2_14/Externals/scew/tests/check_reader_file.c
branches/R2_14/Externals/scew/tests/check_tree.c
branches/R2_14/Externals/scew/tests/check_writer_buffer.c
branches/R2_14/Externals/scew/tests/check_writer_file.c
branches/R2_14/Externals/scew/tests/data/
branches/R2_14/Externals/scew/tests/data/Makefile.am
branches/R2_14/Externals/scew/tests/data/check_reader_file.txt
branches/R2_14/Externals/scew/tests/main.c
branches/R2_14/Externals/scew/tests/test.h
Removed Paths:
-------------
branches/R2_14/Externals/scew/ChangeLog
branches/R2_14/Externals/scew/INSTALL.WIN32
branches/R2_14/Externals/scew/Makefile.in
branches/R2_14/Externals/scew/aclocal.m4
branches/R2_14/Externals/scew/config.h.in
branches/R2_14/Externals/scew/configure
branches/R2_14/Externals/scew/configure.in
branches/R2_14/Externals/scew/depcomp
branches/R2_14/Externals/scew/doc/Makefile.in
branches/R2_14/Externals/scew/etc/Makefile.in
branches/R2_14/Externals/scew/etc/autoconf/Makefile.in
branches/R2_14/Externals/scew/etc/pkg-config/Makefile.in
branches/R2_14/Externals/scew/examples/Makefile.in
branches/R2_14/Externals/scew/examples/scew_print/Makefile.in
branches/R2_14/Externals/scew/examples/scew_stream/Makefile.in
branches/R2_14/Externals/scew/examples/scew_write/Makefile.in
branches/R2_14/Externals/scew/install-sh
branches/R2_14/Externals/scew/missing
branches/R2_14/Externals/scew/mkinstalldirs
branches/R2_14/Externals/scew/scew/Makefile.in
branches/R2_14/Externals/scew/scew/types.h
branches/R2_14/Externals/scew/scew/xhandler.c
branches/R2_14/Externals/scew/scew/xhandler.h
branches/R2_14/Externals/scew/scew/xprint.c
branches/R2_14/Externals/scew/scew/xprint.h
branches/R2_14/Externals/scew/scew/xtree.h
branches/R2_14/Externals/scew/win32/Makefile.in
branches/R2_14/Externals/scew/win32/scew.dsp
Modified: branches/R2_14/Externals/scew/AUTHORS
===================================================================
--- branches/R2_14/Externals/scew/AUTHORS 2010-10-27 20:56:49 UTC (rev 7374)
+++ branches/R2_14/Externals/scew/AUTHORS 2010-10-27 21:24:57 UTC (rev 7375)
@@ -1,7 +1,4 @@
Authors of SCEW (Simple C Expat Wrapper)
See also the files THANKS and ChangeLog.
-Aleix Conchillo Flaque designed and implemented SCEW.
-
----
-$Id: AUTHORS,v 1.1 2002/12/03 23:58:55 aleix Exp $
+Aleix Conchillo Flaqu\xE9 designed and implemented SCEW.
Modified: branches/R2_14/Externals/scew/COPYING
===================================================================
--- branches/R2_14/Externals/scew/COPYING 2010-10-27 20:56:49 UTC (rev 7374)
+++ branches/R2_14/Externals/scew/COPYING 2010-10-27 21:24:57 UTC (rev 7375)
@@ -2,7 +2,7 @@
Version 2.1, February 1999
Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
@@ -485,7 +485,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Also add information on how to contact you by electronic and paper mail.
Deleted: branches/R2_14/Externals/scew/ChangeLog
===================================================================
--- branches/R2_14/Externals/scew/ChangeLog 2010-10-27 20:56:49 UTC (rev 7374)
+++ branches/R2_14/Externals/scew/ChangeLog 2010-10-27 21:24:57 UTC (rev 7375)
@@ -1,128 +0,0 @@
-Changes for WinMerge compile:
-
-2008-01-13 Kimmo Varis <ki...@wi...>
- * scew/win32/scew.dsp: Build scew to WinMerge's Build folder. This prevents
- polluting source folders with compiled files.
-
-2007-01-20 Kimmo Varis <ki...@wi...>
- * scew/error.c: Fix compile with VS2005
-
-2006-12-18 Kimmo Varis <ki...@wi...>
- * WinMerge patch [ 1616302 ] Small BUILD bug, in scew.h, for WIN32
- submitted by geoffmc <ge...@us...> to fix ansi
- release target filename.
-
-2006-11-05 Kimmo Varis <ki...@wi...>
-
- * scew/win32/scew.dsp: Added post-build commands to copy
- lib files to /Build/expat
-
- * scew/win32/scew.dsp: Added include path to expat for one
- target (missed in previous commit)
-
-2006-11-01 Kimmo Varis <ki...@wi...>
-
- * scew/win32/scew.dsp: added library paths to WinMerge /Build/expat
-
-**** Changes in version 0.3.2 ****
-
-2004-05-23 Aleix Conchillo Flaque <al...@me...>
-
- * src (Module): Added stream functionality.
-
-2004-03-20 Aleix Conchillo Flaque <al...@me...>
-
- * by now just some minor fixes.
-
-**** Changes in version 0.3.1 ****
-
-2004-01-26 Aleix Conchillo Flaque <al...@me...>
-
- * src/writer.*: write functions moved from tree to new writer
- files.
-
-2004-01-25 Aleix Conchillo Flaque <al...@me...>
-
- * src/xtree.*: added XML preamble support.
-
-2003-12-09 Brodie Thiesfield
-
- * re-jigged the source tree to make building and installing as a
- common system library on Windows easier.
-
- * src directory renamed scew to keep consistency of code on
- both Unix and Windows platforms. Enables cross platform building
- of code always using #include <scew/scew.h>
-
- * added Windows DevStudio 6+ build workspace to easily build
- all required versions of the library.
-
- * much of scew/str.* rewritten to use compiler macros instead of
- separate functions. Means one less level of function calling and
- supports Unicode building on Windows simply.
-
- * scew/mem.* removed (functions now available through str.h)
-
- * added INSTALL.WIN32 file to describe building on Windows
-
-**** Changes in version 0.3.0 ****
-
-2003-07-16 Aleix Conchillo Flaque <al...@me...>
-
- * src/element.c, src/xattribute.c: performance improvement by
- saving last index visited.
-
- * src (Module): Lots of fixes and improvements by Brodie
- Thiesfield.
-
-**** Changes in version 0.2.1 ****
-
-2003-07-09 Aleix Conchillo Flaque <al...@me...>
-
- * src/str.h (Module): Added isalpha, isalnum, isdigit, isspace,
- isprint... functions.
-
- * src/mem.h (Module): Added initial memory functions.
-
-2003-07-08 Aleix Conchillo Flaque <al...@me...>
-
- * src (Module):
- - Added error system
- - Fixed some minor bugs
- - Improve white space parse treatment
- - New string functions
- - Added support for XML declarations attributes (version,
- encoding, standalone)
-
-2003-05-01 Aleix Conchillo Flaque <al...@me...>
-
- * src/tree.c (scew_tree_save_file): file closing fixed.
-
-**** Changes in version 0.2.0 ****
-
-2003-04-25 Aleix Conchillo Flaque <al...@me...>
-
- * src (Module): Added compatibilized headers with C++ (ifdef
- __cplusplus).
-
-2003-04-24 Aleix Conchillo Flaque <al...@me...>
-
- * src (Module): Compilation warnings fixes.
-
- * src/xattribute.c(scew_element_del_attr): memory crash fixed.
-
-**** Changes in version 0.1.1 ****
-
-2003-03-30 Aleix Conchillo Flaque <al...@me...>
-
- * src (Module): Lot of cleanup and some important changes in
- internal data structures. Everything is now based in a triply
- linked tree which is created when reading a file or when creating
- a new XML tree in memory.
-
-2003-02-21 Aleix Conchillo Flaque <al...@me...>
-
- * src (Module): Added new tree structure which is now included in
- scew_parser and will be used for writing purposes.
-
- * ChangeLog started
Modified: branches/R2_14/Externals/scew/INSTALL
===================================================================
--- branches/R2_14/Externals/scew/INSTALL 2010-10-27 20:56:49 UTC (rev 7374)
+++ branches/R2_14/Externals/scew/INSTALL 2010-10-27 21:24:57 UTC (rev 7375)
@@ -19,8 +19,8 @@
be considered for the next release. If at some point `config.cache'
contains results you don't want to keep, you may remove or edit it.
- The file `configure.in' is used to create `configure' by a program
-called `autoconf'. You only need `configure.in' if you want to change
+ The file `configure.ac' is used to create `configure' by a program
+called `autoconf'. You only need `configure.ac' if you want to change
it or regenerate `configure' using a newer version of `autoconf'.
The simplest way to compile this package is:
Deleted: branches/R2_14/Externals/scew/INSTALL.WIN32
===================================================================
--- branches/R2_14/Externals/scew/INSTALL.WIN32 2010-10-27 20:56:49 UTC (rev 7374)
+++ branches/R2_14/Externals/scew/INSTALL.WIN32 2010-10-27 21:24:57 UTC (rev 7375)
@@ -1,49 +0,0 @@
-Windows Installation
-====================
-
-Extract the SCEW distribution library to it's installation location. For
-example, the scew-0.3.2 distribution may be extracted to the directory
-
- c:\lib\scew-0.3.2
-
-Open the scew.dsp file from win32 directory in Visual Studio 6 or Visual
-Studio .NET 2002/2003. Go to the 'Build' menu and select 'Batch
-Build...'. Select all of the configurations to be built and click
-'Rebuild All'. This will build versions of the SCEW library for
-Debug/Release, MBCS/Unicode and not/XML_STATIC.
-
-Note that SCEW is always linked statically with your application. The
-XML_STATIC compile option determines whether libexpat will be used as a
-static linked library or a DLL.
-
-Add the following directories to the DevStudio Project paths. This is
-available via the 'Tools', 'Options' menu. 'Directories' in DevStudio 6,
-'Projects' in DevStudio .NET.
-
- Include Directories
- SCEW top level, e.g. "c:\lib\scew-0.3.2"
-
- Library Directories
- SCEW win32 lib, e.g. "c:\lib\scew-0.3.2\win32\lib"
-
-You will also have to include your Expat library directory to Includes
-and Library:
-
- Include and Library Directories
- <expat_install>\source\lib e.g. "c:\lib\expat\source\lib"
-
-To use SCEW in your application, you simply include the SCEW header file
-like:
-
- #include <scew/scew.h>
-
-Including this header will automatically cause the correct SCEW library
-to be linked in with your application for the current compile
-settings. You do not need to add the SCEW library to the linker
-settings.
-
-Note: you do need to add the appropriate Expat library to your linker
-settings.
-
-===
-$Id: INSTALL.WIN32,v 1.5 2004/01/30 12:12:53 aleix Exp $
Modified: branches/R2_14/Externals/scew/Makefile.am
===================================================================
--- branches/R2_14/Externals/scew/Makefile.am 2010-10-27 20:56:49 UTC (rev 7374)
+++ branches/R2_14/Externals/scew/Makefile.am 2010-10-27 21:24:57 UTC (rev 7375)
@@ -1,15 +1,13 @@
#
-# $Id: Makefile.am,v 1.11 2004/01/29 22:42:09 aleix Exp $
-#
# Author: Aleix Conchillo Flaque <al...@me...>
# Date: Mon Nov 04, 2002 20:29
#
-# Copyright (C) 2002, 2003, 2004 Aleix Conchillo Flaque
+# Copyright (C) 2002-2009 Aleix Conchillo Flaque
#
-SUBDIRS = doc etc win32 scew examples
+SUBDIRS = doc etc scew examples tests win32
-EXTRA_DIST = INSTALL.WIN32
+EXTRA_DIST = ChangeLog.1
.PHONY: doc
@@ -21,6 +19,6 @@
else
doc:
- @echo "Doxygen documentation generation not enabled";
+ @echo "WARNING: Documentation generation not enabled or available";
endif
Deleted: branches/R2_14/Externals/scew/Makefile.in
===================================================================
--- branches/R2_14/Externals/scew/Makefile.in 2010-10-27 20:56:49 UTC (rev 7374)
+++ branches/R2_14/Externals/scew/Makefile.in 2010-10-27 21:24:57 UTC (rev 7375)
@@ -1,539 +0,0 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-# @configure_input@
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-#
-# $Id: Makefile.am,v 1.11 2004/01/29 22:42:09 aleix Exp $
-#
-# Author: Aleix Conchillo Flaque <al...@me...>
-# Date: Mon Nov 04, 2002 20:29
-#
-# Copyright (C) 2002, 2003, 2004 Aleix Conchillo Flaque
-#
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
-
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DOC_FALSE = @DOC_FALSE@
-DOC_TRUE = @DOC_TRUE@
-DOT = @DOT@
-DOXYGEN = @DOXYGEN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-RANLIB = @RANLIB@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-bindir = @bindir@
-build_alias = @build_alias@
-datadir = @datadir@
-enable_dot = @enable_dot@
-enable_html_docs = @enable_html_docs@
-enable_latex_docs = @enable_latex_docs@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-
-SUBDIRS = doc etc win32 scew examples
-
-EXTRA_DIST = INSTALL.WIN32
-subdir = .
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-
-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
- ps-recursive install-info-recursive uninstall-info-recursive \
- all-recursive install-data-recursive install-exec-recursive \
- installdirs-recursive install-recursive uninstall-recursive \
- check-recursive installcheck-recursive
-DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \
- COPYING ChangeLog INSTALL Makefile.am NEWS THANKS aclocal.m4 \
- config.h.in configure configure.in depcomp install-sh missing \
- mkinstalldirs
-DIST_SUBDIRS = $(SUBDIRS)
-all: config.h
- $(MAKE) $(AM_MAKEFLAGS) all-recursive
-
-.SUFFIXES:
-
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
-
-$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- $(SHELL) ./config.status --recheck
-$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
- cd $(srcdir) && $(AUTOCONF)
-
-$(ACLOCAL_M4): configure.in
- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
-config.h: stamp-h1
- @if test ! -f $@; then \
- rm -f stamp-h1; \
- $(MAKE) stamp-h1; \
- else :; fi
-
-stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
- @rm -f stamp-h1
- cd $(top_builddir) && $(SHELL) ./config.status config.h
-
-$(srcdir)/config.h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4)
- cd $(top_srcdir) && $(AUTOHEADER)
- touch $(srcdir)/config.h.in
-
-distclean-hdr:
- -rm -f config.h stamp-h1
-uninstall-info-am:
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-# (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
- @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- echo "Making $$target in $$subdir"; \
- if test "$$subdir" = "."; then \
- dot_seen=yes; \
- local_target="$$target-am"; \
- else \
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- fi; test -z "$$fail"
-
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
- @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
- *) list='$(SUBDIRS)' ;; \
- esac; \
- rev=''; for subdir in $$list; do \
- if test "$$subdir" = "."; then :; else \
- rev="$$subdir $$rev"; \
- fi; \
- done; \
- rev="$$rev ."; \
- target=`echo $@ | sed s/-recursive//`; \
- for subdir in $$rev; do \
- echo "Making $$target in $$subdir"; \
- if test "$$subdir" = "."; then \
- local_target="$$target-am"; \
- else \
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done && test -z "$$fail"
-tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
- done
-ctags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
-
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
- if (etags --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
- else \
- include_option=--include; \
- fi; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -f $$subdir/TAGS && \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
- list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$tags$$unique" \
- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique
-
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-
-GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = .
-distdir = $(PACKAGE)-$(VERSION)
-
-am__remove_distdir = \
- { test ! -d $(distdir) \
- || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
- && rm -fr $(distdir); }; }
-
-GZIP_ENV = --best
-distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print
-
-distdir: $(DISTFILES)
- $(am__remove_distdir)
- mkdir $(distdir)
- $(mkinstalldirs) $(distdir)/doc $(distdir)/etc/pkg-config
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
- if test -d $$d/$$file; then \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
- else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
- || exit 1; \
- fi; \
- done
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d $(distdir)/$$subdir \
- || mkdir $(distdir)/$$subdir \
- || exit 1; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$(top_distdir)" \
- distdir=../$(distdir)/$$subdir \
- distdir) \
- || exit 1; \
- fi; \
- done
- -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
- ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
- || chmod -R a+r $(distdir)
-dist-gzip: distdir
- $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
- $(am__remove_distdir)
-
-dist dist-all: distdir
- $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
- $(am__remove_distdir)
-
-# This target untars the dist file and tries a VPATH configuration. Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
- $(am__remove_distdir)
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
- chmod -R a-w $(distdir); chmod a+w $(distdir)
- mkdir $(distdir)/_build
- mkdir $(distdir)/_inst
- chmod a-w $(distdir)
- dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
- && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
- && cd $(distdir)/_build \
- && ../configure --srcdir=.. --prefix="$$dc_install_base" \
- $(DISTCHECK_CONFIGURE_FLAGS) \
- && $(MAKE) $(AM_MAKEFLAGS) \
- && $(MAKE) $(AM_MAKEFLAGS) dvi \
- && $(MAKE) $(AM_MAKEFLAGS) check \
- && $(MAKE) $(AM_MAKEFLAGS) install \
- && $(MAKE) $(AM_MAKEFLAGS) installcheck \
- && $(MAKE) $(AM_MAKEFLAGS) uninstall \
- && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
- distuninstallcheck \
- && chmod -R a-w "$$dc_install_base" \
- && ({ \
- (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \
- && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
- && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
- && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
- distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
- } || { rm -rf "$$dc_destdir"; exit 1; }) \
- && rm -rf "$$dc_destdir" \
- && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
- && rm -f $(distdir).tar.gz \
- && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
- $(am__remove_distdir)
- @echo "$(distdir).tar.gz is ready for distribution" | \
- sed 'h;s/./=/g;p;x;p;x'
-distuninstallcheck:
- @cd $(distuninstallcheck_dir) \
- && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
- || { echo "ERROR: files left after uninstall:" ; \
- if test -n "$(DESTDIR)"; then \
- echo " (check DESTDIR support)"; \
- fi ; \
- $(distuninstallcheck_listfiles) ; \
- exit 1; } >&2
-distcleancheck: distclean
- @if test '$(srcdir)' = . ; then \
- echo "ERROR: distcleancheck can only run from a VPATH build" ; \
- exit 1 ; \
- fi
- @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
- || { echo "ERROR: files left in build directory after distclean:" ; \
- $(distcleancheck_listfiles) ; \
- exit 1; } >&2
-check-am: all-am
-check: check-recursive
-all-am: Makefile config.h
-installdirs: installdirs-recursive
-installdirs-am:
-
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
- -rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-generic mostlyclean-am
-
-distclean: distclean-recursive
- -rm -f $(am__CONFIG_DISTCLEAN_FILES)
- -rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-hdr distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-info: info-recursive
-
-info-am:
-
-install-data-am:
-
-install-exec-am:
-
-install-info: install-info-recursive
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
- -rm -f $(am__CONFIG_DISTCLEAN_FILES)
- -rm -rf $(top_srcdir)/autom4te.cache
- -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am: uninstall-info-am
-
-uninstall-info: uninstall-info-recursive
-
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
- clean-generic clean-recursive ctags ctags-recursive dist \
- dist-all dist-gzip distcheck distclean distclean-generic \
- distclean-hdr distclean-recursive distclean-tags distcleancheck \
- distdir distuninstallcheck dvi dvi-am dvi-recursive info \
- info-am info-recursive install install-am install-data \
- install-data-am install-data-recursive install-exec \
- install-exec-am install-exec-recursive install-info \
- install-info-am install-info-recursive install-man \
- install-recursive install-strip installcheck installcheck-am \
- installdirs installdirs-am installdirs-recursive \
- maintainer-clean maintainer-clean-generic \
- maintainer-clean-recursive mostlyclean mostlyclean-generic \
- mostlyclean-recursive pdf pdf-am pdf-recursive ps ps-am \
- ps-recursive tags tags-recursive uninstall uninstall-am \
- uninstall-info-am uninstall-info-recursive uninstall-recursive
-
-
-.PHONY: doc
-
-@DOC_TRUE@doc:
-@DOC_TRUE@ (cd doc && $(MAKE) doc)
-
-@DOC_FALSE@doc:
-@DOC_FALSE@ @echo "Doxygen documentation generation not enabled";
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
Modified: branches/R2_14/Externals/scew/NEWS
===================================================================
--- branches/R2_14/Externals/scew/NEWS 2010-10-27 20:56:49 UTC (rev 7374)
+++ branches/R2_14/Externals/scew/NEWS 2010-10-27 21:24:57 UTC (rev 7375)
@@ -1,204 +1,340 @@
SCEW -- History of visible changes.
-Copyright (C) 2002, 2003, 2004 Aleix Conchillo Flaque
+Copyright (C) 2002-2010 Aleix Conchillo Flaqu\xE9
See the end for copying conditions.
------------------------------------------------------------------------
-* Version 0.4.0 (25/05/04)
+* Version 1.1.2 (2010/06/04)
+** Fixes:
+
+ - Precondition violation when assigning preamble to tree after
+ trimming and becoming NULL (scew/xparser.c).
+ (reported by Rudolf Alexander Kerbitz)
+
+------------------------------------------------------------------------
+
+* Version 1.1.1 (2009/12/11)
+
** Changes:
- - Ability to load and XML document from an stream has been
- added. The stream may not be completed, so it will just load
- correct XML pieces. A callback, set by the user, will be
- called each time an element is available.
- (thanks to Gord Shier)
+ - Element contents and attribute values are now escaped when
+ printing by using the new scew_strescape function.
+ - Examples correctly output UTF-16 characters in Windows console.
+
+------------------------------------------------------------------------
+
+* Version 1.1.0 (2009/11/30)
+
+** API changes:
+
+ - scew_tree_compare and scew_element_compare now receive an extra
+ argument to specify user defined comparisons.
+
+** Changes:
+
+ - Tree and element comparison function can now take a user defined
+ comparison function.
+
** Fixes:
- - Fixed indentation level when document contains multiple
- consecutive empty elements.
- (thanks to Tom Probasco)
+ - Missing _cpluplus closing brace in printer.h.
+ (closes #28130)
- - scew_element_add_attr_pair() did not add a new attribute
- correctly if the attribute already existed.
- (reported by Matthew Peltzer)
+ - Printer stops printing when element with zero-length contents is
+ encountered.
+ (closes #28125)
- - Compiltaion fixes in MSVC. Compiler interpreted a function
- argument called list as the std::list.
- (reported by Renaud Dumont)
+------------------------------------------------------------------------
+* Version 1.0.0 (2009/10/30)
+
+** API changes:
+
+ - scew_parser_load now uses an SCEW reader to read the XML
+ document. It also returns a scew_tree giving the user to
+ responsibility to free it.
+
+ - scew_parser_tree has been removed.
+
+ - Parse loading notifications (via hooks) can be added for elements
+ and trees.
+
+ - A new type, scew_printer, has been added to provide XML document
+ printing. Printers work with any SCEW writer type to perform the
+ actual output.
+
+ - Two new types, scew_reader and scew_writer, have been created to
+ support any type of I/O. Two default I/O interfaces are provided:
+ files and memory buffers. New I/O sources can be easily added.
+
+ - More functions to delete attributes and child elements have been
+ added to the scew_element interface.
+
+ - Attribute functions related to elements have been moved to the
+ scew_element interface.
+
+ - Some element functions have been renamed, mostly the ones related
+ to attributes.
+
+ - Added copy and comparison functions in most SCEW types: trees,
+ elements and attributes.
+
+ - A new type, scew_list, has been defined and used for scew_element
+ children and attributes. scew_list provides a general way to work
+ with lists, thus no code repetition is done and there is a
+ flexible and general way to work with lists.
+
+ - Added new scew_bool type. In the future, this should be changed
+ in favor of the bool type defined by C99.
+
+ - Added scew_element_detach which detaches an element from its
+ parent (it does not free it).
+ (suggested by Alex Katebi)
+
+ - Added scew_element_parent which returns an element's parent if
+ any.
+ (thanks to dsk AT purdue DOT edu and Alex Katebi)
+
+ - Added scew_element_add_pair which allows to add a new attribute
+ with a name and contents.
+ (thanks to Christopher Layne)
+
+** Changes:
+
+ - Windows support has been updated to Microsoft Visual C++ 2008. It
+ is now also possible to build SCEW DLLs and SCEW examples.
+
+ - UTF-16 is better supported (only under Windows platforms).
+
+ - XML preamble (anything between XML declaration and root element)
+ is now parsed.
+
+ - XML declaration standalone attribute is now used.
+
+ - Unit Test cases have been added using Check unit testing
+ framework (C99 needed).
+ (see http://check.sf.net)
+
+ - Code has been cleaned to allow better definition of private and
+ public interfaces.
+
+ - Documentation has been improved and organized into modules.
+
+ - SCEW now uses libtool to generate a static or dynamic library.
+
+ - Thread support can now be disabled (see ./configure --help).
+
+** Fixes:
+
+ - Fix compilation warnings in error.c and parser.c.
+ (reported by Aaron S. Kurland)
+
+ - Fix scew_tree_free documentation.
+ (reported by Gord Shier)
+
+ - Hardcoded gcc "CFLAGS" removed.
+ (reported by Mark Zieg)
+
------------------------------------------------------------------------
-* Version 0.3.2 (30/01/04)
+* Version 0.4.0 (2004/05/25)
** Changes:
- - A new "Unknown error code" message has been added.
- (thanks to Brodie Thiesfield)
+ - Ability to load and XML document from an stream has been
+ added. The stream may not be completed, so it will just load
+ correct XML pieces. A callback, set by the user, will be called
+ each time an element is available.
+ (thanks to Gord Shier)
- - Improved support for Windows and Unix compilation.
- (thanks to Brodie Thiesfield)
+** Fixes:
- - Added improvements in str functions. mem.* has been removed.
- (thanks to Brodie Thiesfield)
+ - Fixed indentation level when document contains multiple
+ consecutive empty elements.
+ (thanks to Tom Probasco)
- - Write functions have been moved from tree to new writer.*
- files.
+ - scew_element_add_attr_pair() did not add a new attribute
+ correctly if the attribute already existed.
+ (reported by Matthew Peltzer)
- - Added a preamble section to the XML declaration.
+ - Compiltaion fixes in MSVC. Compiler interpreted a function
+ argument called list as the std::list.
+ (reported by Renaud Dumont)
+------------------------------------------------------------------------
+
+* Version 0.3.2 (2004/01/30)
+
+** Changes:
+
+ - A new "Unknown error code" message has been added.
+ (thanks to Brodie Thiesfield)
+
+ - Improved support for Windows and Unix compilation.
+ (thanks to Brodie Thiesfield)
+
+ - Added improvements in str functions. mem.* has been removed.
+ (thanks to Brodie Thiesfield)
+
+ - Write functions have been moved from tree to new writer.* files.
+
+ - Added a preamble section to the XML declaration.
+
** Fixes:
- - Allow building in a separate directory.
- (thanks to Kalle Valo)
+ - Allow building in a separate directory.
+ (thanks to Kalle Valo)
------------------------------------------------------------------------
-* Version 0.3.1 (21/07/03)
+* Version 0.3.1 (2003/07/21)
** Changes:
- - Added missing performace improvements by using the linked list
- in element and attribute iterations.
- (thanks to Brodie Thiesfield)
+ - Added missing performace improvements by using the linked list in
+ element and attribute iterations.
+ (thanks to Brodie Thiesfield)
- - Added exponentially growing buffer to avoid many realloc calls
- which are slow and fragment memory in scew_element_list.
- (thanks to Brodie Thiesfield)
+ - Added exponentially growing buffer to avoid many realloc calls
+ which are slow and fragment memory in scew_element_list.
+ (thanks to Brodie Thiesfield)
- - Performance improvements in file loading by using a static
- buffer.
- (thanks to Brodie Thiesfield)
+ - Performance improvements in file loading by using a static
+ buffer.
+ (thanks to Brodie Thiesfield)
- - Added scew_parser_load_file_fp().
- (thanks to Brodie Thiesfield)
+ - Added scew_parser_load_file_fp().
+ (thanks to Brodie Thiesfield)
- - Some other minor changes.
- (thanks to Brodie Thiesfield)
+ - Some other minor changes.
+ (thanks to Brodie Thiesfield)
** Fixes:
- - scew_isxdigit() was calling isdigit() instead of isxdigit().
+ - scew_isxdigit() was calling isdigit() instead of isxdigit().
- - scew_isxxxx() fixed.
- (thanks to Brodie Thiesfield)
+ - scew_isxxxx() fixed.
+ (thanks to Brodie Thiesfield)
- - strdup() is a GNU extension, replaced it by own version.
+ - strdup() is a GNU extension, replaced it by own version.
- - Fixed scew_element_by_name.
- (reported by Eric Fronheiser)
+ - Fixed scew_element_by_name.
+ (reported by Eric Fronheiser)
- - Warning fixes (level 4) in Microsoft Visual C++ 7.
- (thanks to Brodie Thiesfield)
+ - Warning fixes (level 4) in Microsoft Visual C++ 7.
+ (thanks to Brodie Thiesfield)
- - Multi-thread support fixed in Microsoft Visual
- C++. __declspec(thread) did not work, use TLS functions
- instead.
- (thanks to Brodie Thiesfield)
+ - Multi-thread support fixed in Microsoft Visual
+ C++. __declspec(thread) did not work, use TLS functions instead.
+ (thanks to Brodie Thiesfield)
------------------------------------------------------------------------
-* Version 0.3.0 (10/07/03)
+* Version 0.3.0 (2003/07/10)
** Changes:
- - Added more string functions. New memory functions have also
- been added.
+ - Added more string functions. New memory functions have also been
+ added.
- - Performance improved in element and attribute iteration.
- (thanks to Sanzo Miyazawa)
+ - Performance improved in element and attribute iteration.
+ (thanks to Sanzo Miyazawa)
- - Support for XML declaration attributes has been added
- (version, encoding, standalone). This attributes can be
- changed using SCEW tree functions.
+ - Support for XML declaration attributes has been added (version,
+ encoding, standalone). This attributes can be changed using SCEW
+ tree functions.
- - Improved white spaces treatment in XML element contents.
+ - Improved white spaces treatment in XML element contents.
- - Added error system. See documentation for more details.
+ - Added error system. See documentation for more details.
- - Added pkg-config file.
- (thanks to Neil Harvey)
+ - Added pkg-config file.
+ (thanks to Neil Harvey)
- - Added 'make doc'. If you have doxygen installed (which will be
- automatically detected), it will create SCEW documentation.
- Execute './configure --help' to see more documentation
- options.
+ - Added 'make doc'. If you have doxygen installed (which will be
+ automatically detected), it will create SCEW
+ documentation. Execute './configure --help' to see more
+ documentation options.
- - 'make install' does not install example binaries anymore.
+ - 'make install' does not install example binaries anymore.
** Fixes:
- - scew_tree_save_file() did not fclose output file.
- (reported by Paul Bohme)
+ - scew_tree_save_file() did not fclose output file.
+ (reported by Paul Bohme)
- - scew_element_free() did not decrement parent number of
- children.
- (reported by anonymous)
+ - scew_element_free() did not decrement parent number of children.
+ (reported by anonymous)
------------------------------------------------------------------------
-* Version 0.2.1 (25/04/03)
+* Version 0.2.1 (2003/04/25)
** Changes:
- - Added --enable-debug flag to the configure script.
+ - Added --enable-debug flag to the configure script.
** Fixes:
- - Added compatibilized headers with C++ (ifdef __cplusplus).
+ - Added compatibilized headers with C++ (ifdef __cplusplus).
- - Compilation warnings fixed.
+ - Compilation warnings fixed.
- - scew_element_del_attr() segmentation fault fixed.
- (reported by Jussi M\xE4ki)
+ - scew_element_del_attr() segmentation fault fixed.
+ (reported by Jussi M\xE4ki)
------------------------------------------------------------------------
-* Version 0.2.0 (07/04/03)
+* Version 0.2.0 (2003/04/07)
** Changes:
- - Functions to create and save XML files have been added.
+ - Functions to create and save XML files have been added.
- - A lot of cleanup and rewriting has been done. Internal
- structures have changed.
+ - A lot of cleanup and rewriting has been done. Internal structures
+ have changed.
** Fixes:
------------------------------------------------------------------------
-* Version 0.1.1 (14/01/03)
+* Version 0.1.1 (2003/01/14)
** Changes:
** Fixes:
- - scew_get_element_by_name() and scew_get_attribute_by_name()
- did not return NULL if an element/attribute was not found.
- (reported by Stuart R. Anderson)
+ - scew_get_element_by_name() and scew_get_attribute_by_name() did
+ not return NULL if an element/attribute was not found.
+ (reported by Stuart R. Anderson)
------------------------------------------------------------------------
-* Version 0.1.0 (05/12/02)
+* Version 0.1.0 (2002/12/05)
** Initial release
------------------------------------------------------------------------
-Copying information:
-Copyright (C) 2002, 2003, 2004 Aleix Conchillo Flaque
+* Copying information:
- Permission is granted to anyone to make or distribute verbatim copies
-of this document as received, in any medium, provided that the copyright
-notice and this permission notice are preserved, thus giving the
-recipient permission to redistribute in turn.
+Copyright (C) 2002-2010 Aleix Conchillo Flaqu\xE9
- Permission is granted to distribute modified versions of this
-document, or of portions of it, under the above conditions, provided
-also that they carry prominent notices stating who last changed them.
+ Permission is granted to anyone to make or distribute verbatim
+ copies of this document as received, in any medium, provided that
+ the copyright notice and this permission notice are preserved, thus
+ giving the recipient permission to redistribute in turn.
----
-$Id: NEWS,v 1.21 2004/05/25 21:10:54 aleix Exp $
+ Permission is granted to distribute modified versions of this
+ document, or of portions of it, under the above conditions,
+ provided also that they carry prominent notices stating who last
+ changed them.
+
+--
+;;; Local Variables:
+;;; mode: outline
+;;; End:
Modified: branches/R2_14/Externals/scew/README
===================================================================
--- branches/R2_14/Externals/scew/README 2010-10-27 20:56:49 UTC (rev 7374)
+++ branches/R2_14/Externals/scew/README 2010-10-27 21:24:57 UTC (rev 7375)
@@ -1,16 +1,21 @@
Welcome to SCEW (Simple C Expat Wrapper)
+========================================
- The aim of SCEW is to provide an easy interface around the XML Expat
-parser. It provides functions to load and access XML elements without
-the need to create the Expat event handling routines each time you want
-to load a different XML document. It also lets you access to the
-internal Expat parser, that means you can still have all the
-functionality that Expat library gives you.
+ The aim of SCEW is to provide an easy interface around the XML
+Expat parser, as well as a simple interface for creating new XML
+documents. It provides functions to load and access XML elements
+without the need to create Expat event handling routines every time
+you want to load a new XML document.
- Since version 0.2.0, SCEW incorporates functions to create and handle
-XML trees. That is, add and delete nodes, change attribute names and
-values...
+These are the main SCEW features:
+ - Uses a DOM-like object model for new or parsed XML documents.
+ - Supports loading concatenated XML documents.
+ - Can copy and compare full XML documents, elements or attributes.
+ - Writes XML documents to multiple outputs.
+ - Allows adding new I/O sources easily.
+ - UTF-8, ISO-8859-1 and US-ASCII encodings (and UTF-16 in Windows).
+
Project homepage: http://www.nongnu.org/scew/
SCEW is free software [0]. Please see the file COPYING for details.
@@ -21,6 +26,3 @@
[0] To learn more about GNU, the FSF and its goals, please visit
http://www.gnu.org.
-
----
-$Id: README,v 1.4 2004/01/29 22:52:15 aleix Exp $
Modified: branches/R2_14/Externals/scew/THANKS
===================================================================
--- branches/R2_14/Externals/scew/THANKS 2010-10-27 20:56:49 UTC (rev 7374)
+++ branches/R2_14/Externals/scew/THANKS 2010-10-27 21:24:57 UTC (rev 7375)
@@ -1,32 +1,34 @@
Acknowledgements
-****************
+================
- It has been written originally by Aleix Conchillo Flaque. Many people
-have contributed to SCEW by reporting problems, suggesting improvements,
-or submitting actual code. Here is a list of these people. Help me keep
-it complete and exempt of errors.
+ It has been written originally by Aleix Conchillo Flaqu\xE9. Many
+people have contributed to SCEW by reporting problems, suggesting
+improvements, or submitting actual code. Here is a list of these
+people. Help me keep it complete and exempt of errors.
-* Jose A. Ortega suggested some important C implementation details. As
+* Jose A. Ortega suggested some important C implementation details. As
usual, he has helped me in many other ways. Thanks jao!
-* Brodie Thiesfield has submit lots of fixes and improvements. He has
- also improved builds on Windows, and many more.
+* Brodie Thiesfield has submitted lots of fixes and improvements. He
+ also provided the initial builds on Windows, and many more.
-* Sanzo Miyazawa has submit code to improve performance in element and
- attribute iteration.
+* Sanzo Miyazawa submitted code to improve performance in element and
+ attribute iteration in first releases.
-* Gord Shier has implemented the load stream functionality.
+* Gord Shier implemented the first load stream functionality.
* Neil Harvey has contributed the pkg-config file.
-* Carlos Carrasco has helped a lot in the debugging and testing
- phases. Those nigths at IRC are really great. Thanks!
+* Carlos Carrasco helped a lot in the debugging and testing phases of
+ initial releases. Those nigths at IRC were really great. Thanks!
-* Lluis Gesa has also helped in testing the package.
+* Lluis Gesa also helped in testing the package and listened to my
+ boring implementation thoughts of SCEW readers/writers.
-* Bug reporting (in alphabetical order):
- Anonymous reporters, Stuart R. Anderson, Paul Bohme, Eric Fronheiser,
- Jussi M\xE4ki, Sanzo Miyazawa, Brodie Thiesfield, Kalle Vallo.
+* Bug reporting and others (in alphabetical order):
----
-$Id: THANKS,v 1.13 2004/05/25 20:28:43 aleix Exp $
+ Anonymous reporters, Stuart R. Anderson, Paul Bohme, Eric
+ Fronheiser, Alex Katebi, Rudolf Alexander Kerbitz, Aaron S. Kurland,
+ Christopher Layne, Jussi M\xE4ki, Sanzo Miyazawa, George Neill, Gord
+ Shier, Brodie Thiesfield, Andrew Thomas, Kalle Vallo, Michal Wozniak
+ and Mark Zieg.
Deleted: branches/R2_14/Externals/scew/aclocal.m4
===================================================================
--- branches/R2_14/Externals/scew/aclocal.m4 2010-10-27 20:56:49 UTC (rev 7374)
+++ branches/R2_14/Externals/scew/aclocal.m4 2010-10-27 21:24:57 UTC (rev 7375)
@@ -1,950 +0,0 @@
-# generated automatically by aclocal 1.7.9 -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-# Do all the work for Automake. -*- Autoconf -*-
-
-# This macro actually does too much some checks are only needed if
-# your package does certain things. But this isn't really a big deal.
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
-
-# 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, 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., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 10
-
-AC_PREREQ([2.54])
-
-# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow
-# the ones we care about.
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-
-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-# AM_INIT_AUTOMAKE([OPTIONS])
-# -----------------------------------------------
-# The call with PACKAGE and VERSION arguments is the old style
-# call (pre autoconf-2.50), which is being phased out. PACKAGE
-# and VERSION should now be passed to AC_INIT and removed from
-# the call to AM_INIT_AUTOMAKE.
-# We support both call styles for the transition. After
-# the next Automake release, Autoconf can make the AC_INIT
-# arguments mandatory, and then we can depend on a new Autoconf
-# release and drop the old call support.
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
- AC_REQUIRE([AC_PROG_INSTALL])dnl
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
- test -f $srcdir/config.status; then
- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
- if (cygpath --version) >/dev/null 2>/dev/null; then
- CYGPATH_W='cygpath -w'
- else
- CYGPATH_W=echo
- fi
-fi
-AC_SUBST([CYGPATH_W])
-
-# Define the identity of the package.
-dnl Distinguish between old-style and new-style calls.
-m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
- AC_SUBST([PACKAGE], [$1])dnl
- AC_SUBST([VERSION], [$2])],
-[_AM_SET_OPTIONS([$1])dnl
- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-
-_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-
-# Some tools Automake needs.
-AC_REQUIRE([AM_SANITY_CHECK])dnl
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
-AM_MISSING_PROG(AMTAR, tar)
-AM_PROG_INSTALL_SH
-AM_PROG_INSTALL_STRIP
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-
-_AM_IF_OPTION([no-dependencies],,
-[AC_PROVIDE_IFELSE([AC_PROG_CC],
- [_AM_DEPENDENCIES(CC)],
- [define([AC_PROG_CC],
- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_CXX],
- [_AM_DEPENDENCIES(CXX)],
- [define([AC_PROG_CXX],
- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-])
-])
-
-
-# When config.status generates a header, we must update the stamp-h file.
-# This file resides in the same directory as the config header
-# that is generated. The stamp files are numbered to have different names.
-
-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-# loop where config.status creates the headers, so we can generate
-# our stamp files there.
-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-[# Compute $1's index in $config_headers.
-_am_stamp_count=1
-for _am_header in $config_headers :; do
- case $_am_header in
- $1 | $1:* )
- break ;;
- * )
- _am_stamp_count=`expr $_am_stamp_count + 1` ;;
- esac
-done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
-
-# Copyright 2002 Free Software Foundation, Inc.
-
-# 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, 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., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
- [AM_AUTOMAKE_VERSION([1.7.9])])
-
-# Helper functions for option handling. -*- Autoconf -*-
-
-# Copyright 2001, 2002 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU G...
[truncated message content] |
|
From: <ki...@us...> - 2010-10-27 20:56:55
|
Revision: 7374
http://winmerge.svn.sourceforge.net/winmerge/?rev=7374&view=rev
Author: kimmov
Date: 2010-10-27 20:56:49 +0000 (Wed, 27 Oct 2010)
Log Message:
-----------
BuildScript: Fix building and copying ShellExtension DLLs.
Modified Paths:
--------------
branches/R2_14/Tools/Scripts/create_release.py
Modified: branches/R2_14/Tools/Scripts/create_release.py
===================================================================
--- branches/R2_14/Tools/Scripts/create_release.py 2010-10-27 20:55:22 UTC (rev 7373)
+++ branches/R2_14/Tools/Scripts/create_release.py 2010-10-27 20:56:49 UTC (rev 7374)
@@ -319,11 +319,11 @@
# devenv Src\Merge.dsp /rebuild Release
print 'Build ShellExtension dlls...'
- ret = call([vs_cmd, solution_path, '/rebuild', 'Release MinDependency'])
+ ret = call([vs_cmd, solution_path, '/rebuild', 'Release MinDependency|Win32'])
if ret != 0:
- return print 'ERROR: Failed to build ANSI target of ShellExtension!'
+ print 'ERROR: Failed to build ANSI target of ShellExtension!'
return False
- ret = call([vs_cmd, solution_path, '/rebuild', 'Unicode Release MinDependency'])
+ ret = call([vs_cmd, solution_path, '/rebuild', 'Unicode Release MinDependency|Win32'])
if ret == 0:
if build_64bit == True:
ret = call([vs_cmd, solution_path, '/rebuild', 'X64 Release|x64'])
@@ -395,8 +395,8 @@
shutil.copy('build/mergerelease/WinMerge.exe', bin_folder)
shutil.copy('build/mergeunicoderelease/WinMergeU.exe', bin_folder)
- shutil.copy('build/mergerelease/ShellExtension.dll', bin_folder)
- shutil.copy('build/mergeunicoderelease/ShellExtensionU.dll', bin_folder)
+ shutil.copy('build/ShellExtension/Release MinDependency/ShellExtension.dll', bin_folder)
+ shutil.copy('build/ShellExtension/unicode release mindependency/ShellExtensionU.dll', bin_folder)
shutil.copy('build/mergeunicoderelease/MergeLang.dll', bin_folder)
shutil.copy('build/ShellExtension/x64 release/ShellExtensionX64.dll', bin_folder)
shutil.copy('ShellExtension/Register.bat', bin_folder)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2010-10-27 20:55:28
|
Revision: 7373
http://winmerge.svn.sourceforge.net/winmerge/?rev=7373&view=rev
Author: kimmov
Date: 2010-10-27 20:55:22 +0000 (Wed, 27 Oct 2010)
Log Message:
-----------
UpdgradeProjects: Add heksedit.vcproj as we still use it in 2.14 Branch.
Modified Paths:
--------------
branches/R2_14/Tools/Scripts/UpgradeProjects.py
Modified: branches/R2_14/Tools/Scripts/UpgradeProjects.py
===================================================================
--- branches/R2_14/Tools/Scripts/UpgradeProjects.py 2010-10-27 20:42:56 UTC (rev 7372)
+++ branches/R2_14/Tools/Scripts/UpgradeProjects.py 2010-10-27 20:55:22 UTC (rev 7373)
@@ -46,6 +46,7 @@
projects = [r'Externals\scew\win32\scew.vcproj',
r'Externals\pcre\Win32\pcre.vcproj',
+ r'Externals\heksedit\heksedit.vcproj',
r'ShellExtension\ShellExtension.vcproj']
# These projects need the manifest file fix
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2010-10-27 20:43:02
|
Revision: 7372
http://winmerge.svn.sourceforge.net/winmerge/?rev=7372&view=rev
Author: kimmov
Date: 2010-10-27 20:42:56 +0000 (Wed, 27 Oct 2010)
Log Message:
-----------
Installer: Fix ShellExtension DLL paths.
Modified Paths:
--------------
branches/R2_14/Installer/InnoSetup/WinMerge.iss
Modified: branches/R2_14/Installer/InnoSetup/WinMerge.iss
===================================================================
--- branches/R2_14/Installer/InnoSetup/WinMerge.iss 2010-10-27 19:41:55 UTC (rev 7371)
+++ branches/R2_14/Installer/InnoSetup/WinMerge.iss 2010-10-27 20:42:56 UTC (rev 7372)
@@ -401,9 +401,9 @@
Source: {#RuntimesX64Installer}; DestDir: {tmp}; Flags: ignoreversion; Components: Core; Check: IsWin64; AfterInstall: RuntimesX64Installer
; Shell extension
-Source: ..\..\Build\MergeUnicodeRelease\ShellExtensionU.dll; DestDir: {app}; Flags: regserver uninsrestartdelete restartreplace promptifolder; Check: not IsWin64
+Source: ..\..\Build\ShellExtension\unicode release mindependency\ShellExtensionU.dll; DestDir: {app}; Flags: regserver uninsrestartdelete restartreplace promptifolder; Check: not IsWin64
; 64-bit version of ShellExtension
-Source: ..\..\Build\ShellExtensionX64\ShellExtensionX64.dll; DestDir: {app}; Flags: regserver uninsrestartdelete restartreplace promptifolder 64bit; MinVersion: 0,5.01.2600; Check: IsWin64
+Source: ..\..\Build\ShellExtension\x64 release\ShellExtensionX64.dll; DestDir: {app}; Flags: regserver uninsrestartdelete restartreplace promptifolder 64bit; MinVersion: 0,5.01.2600; Check: IsWin64
; Expat dll
Source: ..\..\Build\expat\libexpat.dll; DestDir: {app}; Flags: promptifolder; Components: Core
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2010-10-27 19:42:01
|
Revision: 7371
http://winmerge.svn.sourceforge.net/winmerge/?rev=7371&view=rev
Author: kimmov
Date: 2010-10-27 19:41:55 +0000 (Wed, 27 Oct 2010)
Log Message:
-----------
BuildScript: Merge error checking improvements from trunk.
Modified Paths:
--------------
branches/R2_14/Tools/Scripts/create_release.py
Modified: branches/R2_14/Tools/Scripts/create_release.py
===================================================================
--- branches/R2_14/Tools/Scripts/create_release.py 2010-10-27 19:40:45 UTC (rev 7370)
+++ branches/R2_14/Tools/Scripts/create_release.py 2010-10-27 19:41:55 UTC (rev 7371)
@@ -159,7 +159,7 @@
os.remove('build/mergerelease/hekseditU.dll')
if os.path.exists('build/Manual'):
- shutil.rmtree('build/Manual',True)
+ shutil.rmtree('build/Manual', True)
except EnvironmentError, einst:
print 'Error deleting files: '
@@ -189,10 +189,17 @@
# Scripts must be run from the directory where they reside
curdir = os.getcwd()
os.chdir('Src/Languages')
- call(['cscript', '/nologo', 'CreateMasterPotFile.vbs'])
- call(['cscript', '/nologo', 'UpdatePoFilesFromPotFile.vbs'])
+ retval = call(['cscript', '/nologo', 'CreateMasterPotFile.vbs'])
+ if retval == 0:
+ retval = call(['cscript', '/nologo', 'UpdatePoFilesFromPotFile.vbs'])
os.chdir(curdir)
+ if retval == 0:
+ return True
+ else:
+ print 'ERROR: Updating translations failed!'
+ return False
+
def get_and_create_dist_folder(folder):
"""Formats a folder name for version-specific distribution folder
and creates the folder."""
@@ -219,10 +226,16 @@
print 'Exporting sources to ' + dist_src_folder
print 'Exporting from: ' + prog.source
+ retval = 0
if prog.source == 'workspace':
- call([prog.svn_binary, 'export', '--non-interactive', '.', dist_src_folder])
+ retval = call([prog.svn_binary, 'export', '--non-interactive', '.', dist_src_folder])
else:
- call([prog.svn_binary, 'export', '--non-interactive', source_location, dist_src_folder])
+ retval = call([prog.svn_binary, 'export', '--non-interactive', source_location, dist_src_folder])
+ if retval == 0:
+ return True
+ else:
+ print 'Error exporting sources! SVN return value: ' + retval
+ return False
def cleanup_dlls_from_plugins(dist_src_folder):
"""Remove compiled plugin dll files from source distribution folders."""
@@ -249,7 +262,7 @@
#print solution_path
call([vs_cmd, solution_path, '/rebuild', 'Release'], shell=True)
- print 'Build scew library...'
+ print 'Build SCEW library...'
solution_path = os.path.join(cur_path, 'Externals/scew/win32/scew.vcproj')
#print solution_path
call([vs_cmd, solution_path, '/rebuild', 'Release'], shell=True)
@@ -268,12 +281,12 @@
"""Builds all WinMerge targets."""
build_libraries()
-
vs_cmd = get_vs_ide_bin()
+ ret = build_winmerge(vs_cmd)
+ if ret:
+ ret = build_shellext(vs_cmd)
+ return ret
- build_winmerge(vs_cmd)
- build_shellext(vs_cmd)
-
def build_winmerge(vs_cmd):
"""Builds WinMerge executable targets."""
@@ -283,8 +296,17 @@
# devenv Src\Merge.dsp /rebuild Release
print 'Build WinMerge executables...'
- call([vs_cmd, solution_path, '/rebuild', 'Release'], shell=True)
- call([vs_cmd, solution_path, '/rebuild', 'UnicodeRelease'], shell=True)
+ ret = call([vs_cmd, solution_path, '/rebuild', 'Release'], shell=True)
+ if ret == 0:
+ ret = call([vs_cmd, solution_path, '/rebuild', 'UnicodeRelease'], shell=True)
+ if ret == 0:
+ return True
+ else:
+ print 'ERROR: Failed to build Unicode release target of WinMerge!'
+ return False
+ else:
+ print 'ERROR: Failed to build ANSI release target of WinMerge!'
+ return False
def build_shellext(vs_cmd):
'''Builds 32-bit and 64-bit ShellExtension.
@@ -297,7 +319,10 @@
# devenv Src\Merge.dsp /rebuild Release
print 'Build ShellExtension dlls...'
- call([vs_cmd, solution_path, '/rebuild', 'Release MinDependency'])
+ ret = call([vs_cmd, solution_path, '/rebuild', 'Release MinDependency'])
+ if ret != 0:
+ return print 'ERROR: Failed to build ANSI target of ShellExtension!'
+ return False
ret = call([vs_cmd, solution_path, '/rebuild', 'Unicode Release MinDependency'])
if ret == 0:
if build_64bit == True:
@@ -322,7 +347,7 @@
os.chdir('Docs/Users/Manual/build')
print 'Build HTML Help (CHM) manual...'
call(['build_htmlhelp.bat'])
-
+
# HTML manual not build in trunk.
#print 'Build HTML manual for Web with ads...'
#call(['build_html.bat', 'withads'])
@@ -543,7 +568,7 @@
# Now read settings from Tools.ini
prog.read_ini('Tools.ini')
print 'Compiler: ' + prog.vs_path
- print 'Path:' + os.getcwd()
+ print 'Path: ' + os.getcwd()
# Remember the rootfolder
root_path = os.getcwd()
@@ -580,13 +605,16 @@
if dist_folder == '':
sys.exit(1)
dist_src_folder = get_src_dist_folder(dist_folder, version_folder)
- svn_export(dist_src_folder)
+ if svn_export(dist_src_folder) == False:
+ sys.exit(1)
- setup_translations()
+ if setup_translations() == False:
+ sys.exit(1)
update_project_files(root_path)
- build_targets()
+ if build_targets() == False:
+ sys.exit(1)
build_manual()
build_innosetup_installer(dist_folder)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2010-10-27 19:40:54
|
Revision: 7370
http://winmerge.svn.sourceforge.net/winmerge/?rev=7370&view=rev
Author: kimmov
Date: 2010-10-27 19:40:45 +0000 (Wed, 27 Oct 2010)
Log Message:
-----------
BuildScript: Specify Win32 target for 32-bit ShellExtension.
Modified Paths:
--------------
trunk/Tools/Scripts/create_release.py
Modified: trunk/Tools/Scripts/create_release.py
===================================================================
--- trunk/Tools/Scripts/create_release.py 2010-10-27 18:42:06 UTC (rev 7369)
+++ trunk/Tools/Scripts/create_release.py 2010-10-27 19:40:45 UTC (rev 7370)
@@ -289,7 +289,7 @@
# devenv Src\Merge.dsp /rebuild Release
print 'Build ShellExtension dlls...'
- ret = call([vs_cmd, solution_path, '/rebuild', 'Unicode Release MinDependency'])
+ ret = call([vs_cmd, solution_path, '/rebuild', 'Unicode Release MinDependency|Win32'])
if ret == 0:
if build_64bit == True:
ret = call([vs_cmd, solution_path, '/rebuild', 'X64 Release|x64'])
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
