OSDN Git Service

Update version numbers 2.13.13+-jp-8
authorsdottaka <none@none>
Sun, 14 Nov 2010 13:43:08 +0000 (22:43 +0900)
committersdottaka <none@none>
Sun, 14 Nov 2010 13:43:08 +0000 (22:43 +0900)
ArchiveSupport/Merge7z/Merge7zXXX.cpp
ArchiveSupport/Merge7z/Merge7zxxx.vcproj
SetVersion.cmd
Version.h

index c4e4760..54ef317 100644 (file)
@@ -7,7 +7,7 @@
 #include "dllpstub.h"
 #include "Common/UnicodeString.h"
 #include "PipeIPC.h"
-#define DllBuild_Merge7z 27
+#define DllBuild_Merge7z 28
 #include "Merge7z.h"
 #include "tools.h"
 #include "resource.h"
index 433fe0b..01d5ace 100644 (file)
-<?xml version="1.0" encoding="shift_jis"?>
-<VisualStudioProject
-       ProjectType="Visual C++"
-       Version="7.10"
-       Name="Merge7zxxx"
-       SccProjectName=""
-       SccLocalPath="">
-       <Platforms>
-               <Platform
-                       Name="Win32"/>
-       </Platforms>
-       <Configurations>
-               <Configuration
-                       Name="Release|Win32"
-                       OutputDirectory=".\..\BuildTmp\Merge7zxxx___Win32_Release"
-                       IntermediateDirectory=".\..\BuildTmp\Merge7zxxx___Win32_Release"
-                       ConfigurationType="2"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="FALSE"
-                       CharacterSet="2">
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="1"
-                               InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="../../Src/"
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;Merge7zxxx_EXPORTS"
-                               StringPooling="TRUE"
-                               RuntimeLibrary="0"
-                               EnableFunctionLevelLinking="TRUE"
-                               PrecompiledHeaderFile=".\..\BuildTmp\Merge7zxxx___Win32_Release/Merge7zxxx.pch"
-                               AssemblerListingLocation=".\..\BuildTmp\Merge7zxxx___Win32_Release/"
-                               ObjectFile=".\..\BuildTmp\Merge7zxxx___Win32_Release/"
-                               ProgramDataBaseFileName=".\..\BuildTmp\Merge7zxxx___Win32_Release/"
-                               BrowseInformation="1"
-                               WarningLevel="3"
-                               SuppressStartupBanner="TRUE"
-                               CompileAs="0"/>
-                       <Tool
-                               Name="VCCustomBuildTool"/>
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="shlwapi.lib odbc32.lib odbccp32.lib"
-                               OutputFile="../../Build/MergeRelease/Merge7zxxx.dll"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="TRUE"
-                               ModuleDefinitionFile=".\Merge7z.def"
-                               ImportLibrary=".\..\BuildTmp\Merge7zxxx___Win32_Release/Merge7zxxx.lib"
-                               TargetMachine="1"/>
-                       <Tool
-                               Name="VCMIDLTool"
-                               PreprocessorDefinitions="NDEBUG"
-                               MkTypLibCompatible="TRUE"
-                               SuppressStartupBanner="TRUE"
-                               TargetEnvironment="1"
-                               TypeLibraryName=".\..\BuildTmp\Merge7zxxx___Win32_Release/Merge7zxxx.tlb"
-                               HeaderFileName=""/>
-                       <Tool
-                               Name="VCPostBuildEventTool"/>
-                       <Tool
-                               Name="VCPreBuildEventTool"/>
-                       <Tool
-                               Name="VCPreLinkEventTool"/>
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="NDEBUG"
-                               Culture="1031"/>
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"/>
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"/>
-                       <Tool
-                               Name="VCWebDeploymentTool"/>
-                       <Tool
-                               Name="VCManagedWrapperGeneratorTool"/>
-                       <Tool
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-               </Configuration>
-               <Configuration
-                       Name="UnicodeDebug|Win32"
-                       OutputDirectory=".\..\BuildTmp\Merge7zxxx___Win32_UnicodeDebug"
-                       IntermediateDirectory=".\..\BuildTmp\Merge7zxxx___Win32_UnicodeDebug"
-                       ConfigurationType="2"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="FALSE"
-                       CharacterSet="1">
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories="../../Src/"
-                               PreprocessorDefinitions="Merge7zxxx_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="1"
-                               PrecompiledHeaderFile=".\..\BuildTmp\Merge7zxxx___Win32_UnicodeDebug/Merge7zxxx.pch"
-                               AssemblerListingLocation=".\..\BuildTmp\Merge7zxxx___Win32_UnicodeDebug/"
-                               ObjectFile=".\..\BuildTmp\Merge7zxxx___Win32_UnicodeDebug/"
-                               ProgramDataBaseFileName=".\..\BuildTmp\Merge7zxxx___Win32_UnicodeDebug/"
-                               BrowseInformation="1"
-                               WarningLevel="3"
-                               SuppressStartupBanner="TRUE"
-                               DebugInformationFormat="1"
-                               CompileAs="0"/>
-                       <Tool
-                               Name="VCCustomBuildTool"/>
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="shlwapi.lib odbc32.lib odbccp32.lib"
-                               OutputFile="../../Build/MergeUnicodeDebug/Merge7zxxxU.dll"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="TRUE"
-                               ModuleDefinitionFile=".\Merge7z.def"
-                               GenerateDebugInformation="TRUE"
-                               ProgramDatabaseFile="../../Build/MergeUnicodeDebug/Merge7zxxxU.pdb"
-                               ImportLibrary=".\..\BuildTmp\Merge7zxxx___Win32_UnicodeDebug/Merge7zxxxU.lib"
-                               TargetMachine="1"/>
-                       <Tool
-                               Name="VCMIDLTool"
-                               PreprocessorDefinitions="_DEBUG"
-                               MkTypLibCompatible="TRUE"
-                               SuppressStartupBanner="TRUE"
-                               TargetEnvironment="1"
-                               TypeLibraryName=".\..\BuildTmp\Merge7zxxx___Win32_UnicodeDebug/Merge7zxxx.tlb"
-                               HeaderFileName=""/>
-                       <Tool
-                               Name="VCPostBuildEventTool"/>
-                       <Tool
-                               Name="VCPreBuildEventTool"/>
-                       <Tool
-                               Name="VCPreLinkEventTool"/>
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="_DEBUG"
-                               Culture="1031"/>
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"/>
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"/>
-                       <Tool
-                               Name="VCWebDeploymentTool"/>
-                       <Tool
-                               Name="VCManagedWrapperGeneratorTool"/>
-                       <Tool
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-               </Configuration>
-               <Configuration
-                       Name="UnicodeRelease|Win32"
-                       OutputDirectory=".\..\BuildTmp\Merge7zxxx___Win32_UnicodeRelease"
-                       IntermediateDirectory=".\..\BuildTmp\Merge7zxxx___Win32_UnicodeRelease"
-                       ConfigurationType="2"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="FALSE"
-                       CharacterSet="1">
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="1"
-                               InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="../../Src/"
-                               PreprocessorDefinitions="Merge7zxxx_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE"
-                               StringPooling="TRUE"
-                               RuntimeLibrary="0"
-                               EnableFunctionLevelLinking="TRUE"
-                               PrecompiledHeaderFile=".\..\BuildTmp\Merge7zxxx___Win32_UnicodeRelease/Merge7zxxx.pch"
-                               AssemblerListingLocation=".\..\BuildTmp\Merge7zxxx___Win32_UnicodeRelease/"
-                               ObjectFile=".\..\BuildTmp\Merge7zxxx___Win32_UnicodeRelease/"
-                               ProgramDataBaseFileName=".\..\BuildTmp\Merge7zxxx___Win32_UnicodeRelease/"
-                               WarningLevel="3"
-                               SuppressStartupBanner="TRUE"
-                               CompileAs="0"/>
-                       <Tool
-                               Name="VCCustomBuildTool"/>
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="shlwapi.lib odbc32.lib odbccp32.lib"
-                               OutputFile="../../Build/MergeUnicodeRelease/Merge7zxxxU.dll"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="TRUE"
-                               ModuleDefinitionFile=".\Merge7z.def"
-                               ImportLibrary=".\..\BuildTmp\Merge7zxxx___Win32_UnicodeRelease/Merge7zxxxU.lib"
-                               TargetMachine="1"/>
-                       <Tool
-                               Name="VCMIDLTool"
-                               PreprocessorDefinitions="NDEBUG"
-                               MkTypLibCompatible="TRUE"
-                               SuppressStartupBanner="TRUE"
-                               TargetEnvironment="1"
-                               TypeLibraryName=".\..\BuildTmp\Merge7zxxx___Win32_UnicodeRelease/Merge7zxxx.tlb"
-                               HeaderFileName=""/>
-                       <Tool
-                               Name="VCPostBuildEventTool"/>
-                       <Tool
-                               Name="VCPreBuildEventTool"/>
-                       <Tool
-                               Name="VCPreLinkEventTool"/>
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="NDEBUG"
-                               Culture="1031"/>
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"/>
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"/>
-                       <Tool
-                               Name="VCWebDeploymentTool"/>
-                       <Tool
-                               Name="VCManagedWrapperGeneratorTool"/>
-                       <Tool
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-               </Configuration>
-               <Configuration
-                       Name="Debug|Win32"
-                       OutputDirectory=".\..\BuildTmp\Merge7zxxx___Win32_Debug"
-                       IntermediateDirectory=".\..\BuildTmp\Merge7zxxx___Win32_Debug"
-                       ConfigurationType="2"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="FALSE"
-                       CharacterSet="2">
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories="../../Src/"
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;Merge7zxxx_EXPORTS"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="1"
-                               PrecompiledHeaderFile=".\..\BuildTmp\Merge7zxxx___Win32_Debug/Merge7zxxx.pch"
-                               AssemblerListingLocation=".\..\BuildTmp\Merge7zxxx___Win32_Debug/"
-                               ObjectFile=".\..\BuildTmp\Merge7zxxx___Win32_Debug/"
-                               ProgramDataBaseFileName=".\..\BuildTmp\Merge7zxxx___Win32_Debug/"
-                               BrowseInformation="1"
-                               WarningLevel="3"
-                               SuppressStartupBanner="TRUE"
-                               DebugInformationFormat="1"
-                               CompileAs="0"/>
-                       <Tool
-                               Name="VCCustomBuildTool"/>
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalDependencies="shlwapi.lib odbc32.lib odbccp32.lib"
-                               OutputFile="../../Build/MergeDebug/Merge7zxxx.dll"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="TRUE"
-                               ModuleDefinitionFile=".\Merge7z.def"
-                               GenerateDebugInformation="TRUE"
-                               ProgramDatabaseFile="../../Build/MergeDebug/Merge7zxxx.pdb"
-                               ImportLibrary=".\..\BuildTmp\Merge7zxxx___Win32_Debug/Merge7zxxx.lib"
-                               TargetMachine="1"/>
-                       <Tool
-                               Name="VCMIDLTool"
-                               PreprocessorDefinitions="_DEBUG"
-                               MkTypLibCompatible="TRUE"
-                               SuppressStartupBanner="TRUE"
-                               TargetEnvironment="1"
-                               TypeLibraryName=".\..\BuildTmp\Merge7zxxx___Win32_Debug/Merge7zxxx.tlb"
-                               HeaderFileName=""/>
-                       <Tool
-                               Name="VCPostBuildEventTool"/>
-                       <Tool
-                               Name="VCPreBuildEventTool"/>
-                       <Tool
-                               Name="VCPreLinkEventTool"/>
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="_DEBUG"
-                               Culture="1031"/>
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"/>
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"/>
-                       <Tool
-                               Name="VCWebDeploymentTool"/>
-                       <Tool
-                               Name="VCManagedWrapperGeneratorTool"/>
-                       <Tool
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <File
-                       RelativePath="Merge7z.def">
-               </File>
-               <File
-                       RelativePath="Merge7z.h">
-               </File>
-               <File
-                       RelativePath="Merge7zXXX.cpp">
-                       <FileConfiguration
-                               Name="Release|Win32">
-                               <Tool
-                                       Name="VCCLCompilerTool"
-                                       Optimization="1"
-                                       AdditionalIncludeDirectories=""
-                                       PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7zxxx_EXPORTS;$(NoInherit)"
-                                       BrowseInformation="1"/>
-                       </FileConfiguration>
-                       <FileConfiguration
-                               Name="UnicodeDebug|Win32">
-                               <Tool
-                                       Name="VCCLCompilerTool"
-                                       Optimization="0"
-                                       AdditionalIncludeDirectories=""
-                                       PreprocessorDefinitions="Merge7zxxx_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;$(NoInherit)"
-                                       BasicRuntimeChecks="3"
-                                       BrowseInformation="1"/>
-                       </FileConfiguration>
-                       <FileConfiguration
-                               Name="UnicodeRelease|Win32">
-                               <Tool
-                                       Name="VCCLCompilerTool"
-                                       Optimization="1"
-                                       AdditionalIncludeDirectories=""
-                                       PreprocessorDefinitions="Merge7zxxx_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;$(NoInherit)"/>
-                       </FileConfiguration>
-                       <FileConfiguration
-                               Name="Debug|Win32">
-                               <Tool
-                                       Name="VCCLCompilerTool"
-                                       Optimization="0"
-                                       AdditionalIncludeDirectories=""
-                                       PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7zxxx_EXPORTS;$(NoInherit)"
-                                       BasicRuntimeChecks="3"
-                                       BrowseInformation="1"/>
-                       </FileConfiguration>
-               </File>
-               <File
-                       RelativePath="Merge7zxxx.rc">
-                       <FileConfiguration
-                               Name="UnicodeDebug|Win32">
-                               <Tool
-                                       Name="VCResourceCompilerTool"
-                                       PreprocessorDefinitions="_DEBUG;$(NoInherit)"/>
-                       </FileConfiguration>
-                       <FileConfiguration
-                               Name="UnicodeRelease|Win32">
-                               <Tool
-                                       Name="VCResourceCompilerTool"
-                                       PreprocessorDefinitions="NDEBUG;$(NoInherit)"/>
-                       </FileConfiguration>
-               </File>
-               <File
-                       RelativePath="PipeIPC.cpp">
-                       <FileConfiguration
-                               Name="Release|Win32">
-                               <Tool
-                                       Name="VCCLCompilerTool"
-                                       Optimization="1"
-                                       AdditionalIncludeDirectories=""
-                                       PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7zxxx_EXPORTS;$(NoInherit)"
-                                       BrowseInformation="1"/>
-                       </FileConfiguration>
-                       <FileConfiguration
-                               Name="UnicodeDebug|Win32">
-                               <Tool
-                                       Name="VCCLCompilerTool"
-                                       Optimization="0"
-                                       AdditionalIncludeDirectories=""
-                                       PreprocessorDefinitions="Merge7zxxx_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;$(NoInherit)"
-                                       BasicRuntimeChecks="3"
-                                       BrowseInformation="1"/>
-                       </FileConfiguration>
-                       <FileConfiguration
-                               Name="UnicodeRelease|Win32">
-                               <Tool
-                                       Name="VCCLCompilerTool"
-                                       Optimization="1"
-                                       AdditionalIncludeDirectories=""
-                                       PreprocessorDefinitions="Merge7zxxx_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;$(NoInherit)"/>
-                       </FileConfiguration>
-                       <FileConfiguration
-                               Name="Debug|Win32">
-                               <Tool
-                                       Name="VCCLCompilerTool"
-                                       Optimization="0"
-                                       AdditionalIncludeDirectories=""
-                                       PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7zxxx_EXPORTS;$(NoInherit)"
-                                       BasicRuntimeChecks="3"
-                                       BrowseInformation="1"/>
-                       </FileConfiguration>
-               </File>
-               <File
-                       RelativePath="PipeIPC.h">
-               </File>
-               <File
-                       RelativePath="revision.txt">
-               </File>
-               <File
-                       RelativePath="tools.cpp">
-                       <FileConfiguration
-                               Name="Release|Win32">
-                               <Tool
-                                       Name="VCCLCompilerTool"
-                                       Optimization="1"
-                                       AdditionalIncludeDirectories=""
-                                       PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7zxxx_EXPORTS;$(NoInherit)"
-                                       BrowseInformation="1"/>
-                       </FileConfiguration>
-                       <FileConfiguration
-                               Name="UnicodeDebug|Win32">
-                               <Tool
-                                       Name="VCCLCompilerTool"
-                                       Optimization="0"
-                                       AdditionalIncludeDirectories=""
-                                       PreprocessorDefinitions="Merge7zxxx_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;$(NoInherit)"
-                                       BasicRuntimeChecks="3"
-                                       BrowseInformation="1"/>
-                       </FileConfiguration>
-                       <FileConfiguration
-                               Name="UnicodeRelease|Win32">
-                               <Tool
-                                       Name="VCCLCompilerTool"
-                                       Optimization="1"
-                                       AdditionalIncludeDirectories=""
-                                       PreprocessorDefinitions="Merge7zxxx_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;$(NoInherit)"/>
-                       </FileConfiguration>
-                       <FileConfiguration
-                               Name="Debug|Win32">
-                               <Tool
-                                       Name="VCCLCompilerTool"
-                                       Optimization="0"
-                                       AdditionalIncludeDirectories=""
-                                       PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7zxxx_EXPORTS;$(NoInherit)"
-                                       BasicRuntimeChecks="3"
-                                       BrowseInformation="1"/>
-                       </FileConfiguration>
-               </File>
-               <File
-                       RelativePath="tools.h">
-               </File>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="shift_jis"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="7.10"\r
+       Name="Merge7zxxx"\r
+       SccProjectName=""\r
+       SccLocalPath="">\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"/>\r
+       </Platforms>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory=".\..\BuildTmp\Merge7zxxx___Win32_Release"\r
+                       IntermediateDirectory=".\..\BuildTmp\Merge7zxxx___Win32_Release"\r
+                       ConfigurationType="2"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
+                       CharacterSet="2">\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="1"\r
+                               InlineFunctionExpansion="1"\r
+                               AdditionalIncludeDirectories="../../Src/"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;Merge7zxxx_EXPORTS"\r
+                               StringPooling="TRUE"\r
+                               RuntimeLibrary="0"\r
+                               EnableFunctionLevelLinking="TRUE"\r
+                               PrecompiledHeaderFile=".\..\BuildTmp\Merge7zxxx___Win32_Release/Merge7zxxx.pch"\r
+                               AssemblerListingLocation=".\..\BuildTmp\Merge7zxxx___Win32_Release/"\r
+                               ObjectFile=".\..\BuildTmp\Merge7zxxx___Win32_Release/"\r
+                               ProgramDataBaseFileName=".\..\BuildTmp\Merge7zxxx___Win32_Release/"\r
+                               BrowseInformation="1"\r
+                               WarningLevel="3"\r
+                               SuppressStartupBanner="TRUE"\r
+                               CompileAs="0"/>\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"/>\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="version.lib shlwapi.lib odbc32.lib odbccp32.lib"\r
+                               OutputFile="../../Build/MergeRelease/Merge7zxxx.dll"\r
+                               LinkIncremental="1"\r
+                               SuppressStartupBanner="TRUE"\r
+                               ModuleDefinitionFile=".\Merge7z.def"\r
+                               ImportLibrary=".\..\BuildTmp\Merge7zxxx___Win32_Release/Merge7zxxx.lib"\r
+                               TargetMachine="1"/>\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="NDEBUG"\r
+                               MkTypLibCompatible="TRUE"\r
+                               SuppressStartupBanner="TRUE"\r
+                               TargetEnvironment="1"\r
+                               TypeLibraryName=".\..\BuildTmp\Merge7zxxx___Win32_Release/Merge7zxxx.tlb"\r
+                               HeaderFileName=""/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"/>\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="NDEBUG"\r
+                               Culture="1031"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"/>\r
+                       <Tool\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="UnicodeDebug|Win32"\r
+                       OutputDirectory=".\..\BuildTmp\Merge7zxxx___Win32_UnicodeDebug"\r
+                       IntermediateDirectory=".\..\BuildTmp\Merge7zxxx___Win32_UnicodeDebug"\r
+                       ConfigurationType="2"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
+                       CharacterSet="1">\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="../../Src/"\r
+                               PreprocessorDefinitions="Merge7zxxx_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="1"\r
+                               PrecompiledHeaderFile=".\..\BuildTmp\Merge7zxxx___Win32_UnicodeDebug/Merge7zxxx.pch"\r
+                               AssemblerListingLocation=".\..\BuildTmp\Merge7zxxx___Win32_UnicodeDebug/"\r
+                               ObjectFile=".\..\BuildTmp\Merge7zxxx___Win32_UnicodeDebug/"\r
+                               ProgramDataBaseFileName=".\..\BuildTmp\Merge7zxxx___Win32_UnicodeDebug/"\r
+                               BrowseInformation="1"\r
+                               WarningLevel="3"\r
+                               SuppressStartupBanner="TRUE"\r
+                               DebugInformationFormat="1"\r
+                               CompileAs="0"/>\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"/>\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="version.lib shlwapi.lib odbc32.lib odbccp32.lib"\r
+                               OutputFile="../../Build/MergeUnicodeDebug/Merge7zxxxU.dll"\r
+                               LinkIncremental="1"\r
+                               SuppressStartupBanner="TRUE"\r
+                               ModuleDefinitionFile=".\Merge7z.def"\r
+                               GenerateDebugInformation="TRUE"\r
+                               ProgramDatabaseFile="../../Build/MergeUnicodeDebug/Merge7zxxxU.pdb"\r
+                               ImportLibrary=".\..\BuildTmp\Merge7zxxx___Win32_UnicodeDebug/Merge7zxxxU.lib"\r
+                               TargetMachine="1"/>\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="_DEBUG"\r
+                               MkTypLibCompatible="TRUE"\r
+                               SuppressStartupBanner="TRUE"\r
+                               TargetEnvironment="1"\r
+                               TypeLibraryName=".\..\BuildTmp\Merge7zxxx___Win32_UnicodeDebug/Merge7zxxx.tlb"\r
+                               HeaderFileName=""/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"/>\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG"\r
+                               Culture="1031"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"/>\r
+                       <Tool\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="UnicodeRelease|Win32"\r
+                       OutputDirectory=".\..\BuildTmp\Merge7zxxx___Win32_UnicodeRelease"\r
+                       IntermediateDirectory=".\..\BuildTmp\Merge7zxxx___Win32_UnicodeRelease"\r
+                       ConfigurationType="2"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
+                       CharacterSet="1">\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="1"\r
+                               InlineFunctionExpansion="1"\r
+                               AdditionalIncludeDirectories="../../Src/"\r
+                               PreprocessorDefinitions="Merge7zxxx_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE"\r
+                               StringPooling="TRUE"\r
+                               RuntimeLibrary="0"\r
+                               EnableFunctionLevelLinking="TRUE"\r
+                               PrecompiledHeaderFile=".\..\BuildTmp\Merge7zxxx___Win32_UnicodeRelease/Merge7zxxx.pch"\r
+                               AssemblerListingLocation=".\..\BuildTmp\Merge7zxxx___Win32_UnicodeRelease/"\r
+                               ObjectFile=".\..\BuildTmp\Merge7zxxx___Win32_UnicodeRelease/"\r
+                               ProgramDataBaseFileName=".\..\BuildTmp\Merge7zxxx___Win32_UnicodeRelease/"\r
+                               WarningLevel="3"\r
+                               SuppressStartupBanner="TRUE"\r
+                               CompileAs="0"/>\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"/>\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="version.lib shlwapi.lib odbc32.lib odbccp32.lib"\r
+                               OutputFile="../../Build/MergeUnicodeRelease/Merge7zxxxU.dll"\r
+                               LinkIncremental="1"\r
+                               SuppressStartupBanner="TRUE"\r
+                               ModuleDefinitionFile=".\Merge7z.def"\r
+                               ImportLibrary=".\..\BuildTmp\Merge7zxxx___Win32_UnicodeRelease/Merge7zxxxU.lib"\r
+                               TargetMachine="1"/>\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="NDEBUG"\r
+                               MkTypLibCompatible="TRUE"\r
+                               SuppressStartupBanner="TRUE"\r
+                               TargetEnvironment="1"\r
+                               TypeLibraryName=".\..\BuildTmp\Merge7zxxx___Win32_UnicodeRelease/Merge7zxxx.tlb"\r
+                               HeaderFileName=""/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"/>\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="NDEBUG"\r
+                               Culture="1031"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"/>\r
+                       <Tool\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory=".\..\BuildTmp\Merge7zxxx___Win32_Debug"\r
+                       IntermediateDirectory=".\..\BuildTmp\Merge7zxxx___Win32_Debug"\r
+                       ConfigurationType="2"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
+                       CharacterSet="2">\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="../../Src/"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;Merge7zxxx_EXPORTS"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="1"\r
+                               PrecompiledHeaderFile=".\..\BuildTmp\Merge7zxxx___Win32_Debug/Merge7zxxx.pch"\r
+                               AssemblerListingLocation=".\..\BuildTmp\Merge7zxxx___Win32_Debug/"\r
+                               ObjectFile=".\..\BuildTmp\Merge7zxxx___Win32_Debug/"\r
+                               ProgramDataBaseFileName=".\..\BuildTmp\Merge7zxxx___Win32_Debug/"\r
+                               BrowseInformation="1"\r
+                               WarningLevel="3"\r
+                               SuppressStartupBanner="TRUE"\r
+                               DebugInformationFormat="1"\r
+                               CompileAs="0"/>\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"/>\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="version.lib shlwapi.lib odbc32.lib odbccp32.lib"\r
+                               OutputFile="../../Build/MergeDebug/Merge7zxxx.dll"\r
+                               LinkIncremental="1"\r
+                               SuppressStartupBanner="TRUE"\r
+                               ModuleDefinitionFile=".\Merge7z.def"\r
+                               GenerateDebugInformation="TRUE"\r
+                               ProgramDatabaseFile="../../Build/MergeDebug/Merge7zxxx.pdb"\r
+                               ImportLibrary=".\..\BuildTmp\Merge7zxxx___Win32_Debug/Merge7zxxx.lib"\r
+                               TargetMachine="1"/>\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="_DEBUG"\r
+                               MkTypLibCompatible="TRUE"\r
+                               SuppressStartupBanner="TRUE"\r
+                               TargetEnvironment="1"\r
+                               TypeLibraryName=".\..\BuildTmp\Merge7zxxx___Win32_Debug/Merge7zxxx.tlb"\r
+                               HeaderFileName=""/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"/>\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG"\r
+                               Culture="1031"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"/>\r
+                       <Tool\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <File\r
+                       RelativePath="Merge7z.def">\r
+               </File>\r
+               <File\r
+                       RelativePath="Merge7z.h">\r
+               </File>\r
+               <File\r
+                       RelativePath="Merge7zXXX.cpp">\r
+                       <FileConfiguration\r
+                               Name="Release|Win32">\r
+                               <Tool\r
+                                       Name="VCCLCompilerTool"\r
+                                       Optimization="1"\r
+                                       AdditionalIncludeDirectories=""\r
+                                       PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7zxxx_EXPORTS;$(NoInherit)"\r
+                                       BrowseInformation="1"/>\r
+                       </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="UnicodeDebug|Win32">\r
+                               <Tool\r
+                                       Name="VCCLCompilerTool"\r
+                                       Optimization="0"\r
+                                       AdditionalIncludeDirectories=""\r
+                                       PreprocessorDefinitions="Merge7zxxx_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;$(NoInherit)"\r
+                                       BasicRuntimeChecks="3"\r
+                                       BrowseInformation="1"/>\r
+                       </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="UnicodeRelease|Win32">\r
+                               <Tool\r
+                                       Name="VCCLCompilerTool"\r
+                                       Optimization="1"\r
+                                       AdditionalIncludeDirectories=""\r
+                                       PreprocessorDefinitions="Merge7zxxx_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;$(NoInherit)"/>\r
+                       </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug|Win32">\r
+                               <Tool\r
+                                       Name="VCCLCompilerTool"\r
+                                       Optimization="0"\r
+                                       AdditionalIncludeDirectories=""\r
+                                       PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7zxxx_EXPORTS;$(NoInherit)"\r
+                                       BasicRuntimeChecks="3"\r
+                                       BrowseInformation="1"/>\r
+                       </FileConfiguration>\r
+               </File>\r
+               <File\r
+                       RelativePath="Merge7zxxx.rc">\r
+                       <FileConfiguration\r
+                               Name="UnicodeDebug|Win32">\r
+                               <Tool\r
+                                       Name="VCResourceCompilerTool"\r
+                                       PreprocessorDefinitions="_DEBUG;$(NoInherit)"/>\r
+                       </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="UnicodeRelease|Win32">\r
+                               <Tool\r
+                                       Name="VCResourceCompilerTool"\r
+                                       PreprocessorDefinitions="NDEBUG;$(NoInherit)"/>\r
+                       </FileConfiguration>\r
+               </File>\r
+               <File\r
+                       RelativePath="PipeIPC.cpp">\r
+                       <FileConfiguration\r
+                               Name="Release|Win32">\r
+                               <Tool\r
+                                       Name="VCCLCompilerTool"\r
+                                       Optimization="1"\r
+                                       AdditionalIncludeDirectories=""\r
+                                       PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7zxxx_EXPORTS;$(NoInherit)"\r
+                                       BrowseInformation="1"/>\r
+                       </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="UnicodeDebug|Win32">\r
+                               <Tool\r
+                                       Name="VCCLCompilerTool"\r
+                                       Optimization="0"\r
+                                       AdditionalIncludeDirectories=""\r
+                                       PreprocessorDefinitions="Merge7zxxx_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;$(NoInherit)"\r
+                                       BasicRuntimeChecks="3"\r
+                                       BrowseInformation="1"/>\r
+                       </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="UnicodeRelease|Win32">\r
+                               <Tool\r
+                                       Name="VCCLCompilerTool"\r
+                                       Optimization="1"\r
+                                       AdditionalIncludeDirectories=""\r
+                                       PreprocessorDefinitions="Merge7zxxx_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;$(NoInherit)"/>\r
+                       </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug|Win32">\r
+                               <Tool\r
+                                       Name="VCCLCompilerTool"\r
+                                       Optimization="0"\r
+                                       AdditionalIncludeDirectories=""\r
+                                       PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7zxxx_EXPORTS;$(NoInherit)"\r
+                                       BasicRuntimeChecks="3"\r
+                                       BrowseInformation="1"/>\r
+                       </FileConfiguration>\r
+               </File>\r
+               <File\r
+                       RelativePath="PipeIPC.h">\r
+               </File>\r
+               <File\r
+                       RelativePath="revision.txt">\r
+               </File>\r
+               <File\r
+                       RelativePath="tools.cpp">\r
+                       <FileConfiguration\r
+                               Name="Release|Win32">\r
+                               <Tool\r
+                                       Name="VCCLCompilerTool"\r
+                                       Optimization="1"\r
+                                       AdditionalIncludeDirectories=""\r
+                                       PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7zxxx_EXPORTS;$(NoInherit)"\r
+                                       BrowseInformation="1"/>\r
+                       </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="UnicodeDebug|Win32">\r
+                               <Tool\r
+                                       Name="VCCLCompilerTool"\r
+                                       Optimization="0"\r
+                                       AdditionalIncludeDirectories=""\r
+                                       PreprocessorDefinitions="Merge7zxxx_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;$(NoInherit)"\r
+                                       BasicRuntimeChecks="3"\r
+                                       BrowseInformation="1"/>\r
+                       </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="UnicodeRelease|Win32">\r
+                               <Tool\r
+                                       Name="VCCLCompilerTool"\r
+                                       Optimization="1"\r
+                                       AdditionalIncludeDirectories=""\r
+                                       PreprocessorDefinitions="Merge7zxxx_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;$(NoInherit)"/>\r
+                       </FileConfiguration>\r
+                       <FileConfiguration\r
+                               Name="Debug|Win32">\r
+                               <Tool\r
+                                       Name="VCCLCompilerTool"\r
+                                       Optimization="0"\r
+                                       AdditionalIncludeDirectories=""\r
+                                       PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7zxxx_EXPORTS;$(NoInherit)"\r
+                                       BasicRuntimeChecks="3"\r
+                                       BrowseInformation="1"/>\r
+                       </FileConfiguration>\r
+               </File>\r
+               <File\r
+                       RelativePath="tools.h">\r
+               </File>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
index 4e0c136..cb869e2 100644 (file)
@@ -1,8 +1,8 @@
 set MAJOR=2
 set MINOR=13
 set REVISION=13
-set PATCHLEVEL=7
-set PRIVATEBUILD=jp-7
+set PATCHLEVEL=8
+set PRIVATEBUILD=jp-8
 
 set RCVER=%MAJOR%.%MINOR%.%REVISION%.%PATCHLEVEL%
 rem set STRVER=%MAJOR%.%MINOR%.%REVISION%.%PATCHLEVEL%
index a9c26ff..c1bf91f 100644 (file)
--- a/Version.h
+++ b/Version.h
@@ -1,4 +1,4 @@
-#define FILEVER        2,13,13,7\r
-#define PRODUCTVER     2,13,13,7\r
-#define STRFILEVER     "2.13.13.7+-jp-7"\r
-#define STRPRODUCTVER  "2.13.13.7+-jp-7"\r
+#define FILEVER        2,13,13,8\r
+#define PRODUCTVER     2,13,13,8\r
+#define STRFILEVER     "2.13.13.8+-jp-8"\r
+#define STRPRODUCTVER  "2.13.13.8+-jp-8"\r