• R/O
  • HTTP
  • SSH
  • HTTPS

winmerge-jp: 提交


Commit MetaInfo

修订版7f3e4d08226c863d770e48d4fb450a6494b66f0e (tree)
时间2010-11-14 22:43:08
作者sdottaka <none@none>
Commitersdottaka

Log Message

Update version numbers

更改概述

差异

--- a/ArchiveSupport/Merge7z/Merge7zXXX.cpp
+++ b/ArchiveSupport/Merge7z/Merge7zXXX.cpp
@@ -7,7 +7,7 @@
77 #include "dllpstub.h"
88 #include "Common/UnicodeString.h"
99 #include "PipeIPC.h"
10-#define DllBuild_Merge7z 27
10+#define DllBuild_Merge7z 28
1111 #include "Merge7z.h"
1212 #include "tools.h"
1313 #include "resource.h"
--- a/ArchiveSupport/Merge7z/Merge7zxxx.vcproj
+++ b/ArchiveSupport/Merge7z/Merge7zxxx.vcproj
@@ -1,431 +1,431 @@
1-<?xml version="1.0" encoding="shift_jis"?>
2-<VisualStudioProject
3- ProjectType="Visual C++"
4- Version="7.10"
5- Name="Merge7zxxx"
6- SccProjectName=""
7- SccLocalPath="">
8- <Platforms>
9- <Platform
10- Name="Win32"/>
11- </Platforms>
12- <Configurations>
13- <Configuration
14- Name="Release|Win32"
15- OutputDirectory=".\..\BuildTmp\Merge7zxxx___Win32_Release"
16- IntermediateDirectory=".\..\BuildTmp\Merge7zxxx___Win32_Release"
17- ConfigurationType="2"
18- UseOfMFC="0"
19- ATLMinimizesCRunTimeLibraryUsage="FALSE"
20- CharacterSet="2">
21- <Tool
22- Name="VCCLCompilerTool"
23- Optimization="1"
24- InlineFunctionExpansion="1"
25- AdditionalIncludeDirectories="../../Src/"
26- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;Merge7zxxx_EXPORTS"
27- StringPooling="TRUE"
28- RuntimeLibrary="0"
29- EnableFunctionLevelLinking="TRUE"
30- PrecompiledHeaderFile=".\..\BuildTmp\Merge7zxxx___Win32_Release/Merge7zxxx.pch"
31- AssemblerListingLocation=".\..\BuildTmp\Merge7zxxx___Win32_Release/"
32- ObjectFile=".\..\BuildTmp\Merge7zxxx___Win32_Release/"
33- ProgramDataBaseFileName=".\..\BuildTmp\Merge7zxxx___Win32_Release/"
34- BrowseInformation="1"
35- WarningLevel="3"
36- SuppressStartupBanner="TRUE"
37- CompileAs="0"/>
38- <Tool
39- Name="VCCustomBuildTool"/>
40- <Tool
41- Name="VCLinkerTool"
42- AdditionalDependencies="shlwapi.lib odbc32.lib odbccp32.lib"
43- OutputFile="../../Build/MergeRelease/Merge7zxxx.dll"
44- LinkIncremental="1"
45- SuppressStartupBanner="TRUE"
46- ModuleDefinitionFile=".\Merge7z.def"
47- ImportLibrary=".\..\BuildTmp\Merge7zxxx___Win32_Release/Merge7zxxx.lib"
48- TargetMachine="1"/>
49- <Tool
50- Name="VCMIDLTool"
51- PreprocessorDefinitions="NDEBUG"
52- MkTypLibCompatible="TRUE"
53- SuppressStartupBanner="TRUE"
54- TargetEnvironment="1"
55- TypeLibraryName=".\..\BuildTmp\Merge7zxxx___Win32_Release/Merge7zxxx.tlb"
56- HeaderFileName=""/>
57- <Tool
58- Name="VCPostBuildEventTool"/>
59- <Tool
60- Name="VCPreBuildEventTool"/>
61- <Tool
62- Name="VCPreLinkEventTool"/>
63- <Tool
64- Name="VCResourceCompilerTool"
65- PreprocessorDefinitions="NDEBUG"
66- Culture="1031"/>
67- <Tool
68- Name="VCWebServiceProxyGeneratorTool"/>
69- <Tool
70- Name="VCXMLDataGeneratorTool"/>
71- <Tool
72- Name="VCWebDeploymentTool"/>
73- <Tool
74- Name="VCManagedWrapperGeneratorTool"/>
75- <Tool
76- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
77- </Configuration>
78- <Configuration
79- Name="UnicodeDebug|Win32"
80- OutputDirectory=".\..\BuildTmp\Merge7zxxx___Win32_UnicodeDebug"
81- IntermediateDirectory=".\..\BuildTmp\Merge7zxxx___Win32_UnicodeDebug"
82- ConfigurationType="2"
83- UseOfMFC="0"
84- ATLMinimizesCRunTimeLibraryUsage="FALSE"
85- CharacterSet="1">
86- <Tool
87- Name="VCCLCompilerTool"
88- Optimization="0"
89- AdditionalIncludeDirectories="../../Src/"
90- PreprocessorDefinitions="Merge7zxxx_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE"
91- BasicRuntimeChecks="3"
92- RuntimeLibrary="1"
93- PrecompiledHeaderFile=".\..\BuildTmp\Merge7zxxx___Win32_UnicodeDebug/Merge7zxxx.pch"
94- AssemblerListingLocation=".\..\BuildTmp\Merge7zxxx___Win32_UnicodeDebug/"
95- ObjectFile=".\..\BuildTmp\Merge7zxxx___Win32_UnicodeDebug/"
96- ProgramDataBaseFileName=".\..\BuildTmp\Merge7zxxx___Win32_UnicodeDebug/"
97- BrowseInformation="1"
98- WarningLevel="3"
99- SuppressStartupBanner="TRUE"
100- DebugInformationFormat="1"
101- CompileAs="0"/>
102- <Tool
103- Name="VCCustomBuildTool"/>
104- <Tool
105- Name="VCLinkerTool"
106- AdditionalDependencies="shlwapi.lib odbc32.lib odbccp32.lib"
107- OutputFile="../../Build/MergeUnicodeDebug/Merge7zxxxU.dll"
108- LinkIncremental="1"
109- SuppressStartupBanner="TRUE"
110- ModuleDefinitionFile=".\Merge7z.def"
111- GenerateDebugInformation="TRUE"
112- ProgramDatabaseFile="../../Build/MergeUnicodeDebug/Merge7zxxxU.pdb"
113- ImportLibrary=".\..\BuildTmp\Merge7zxxx___Win32_UnicodeDebug/Merge7zxxxU.lib"
114- TargetMachine="1"/>
115- <Tool
116- Name="VCMIDLTool"
117- PreprocessorDefinitions="_DEBUG"
118- MkTypLibCompatible="TRUE"
119- SuppressStartupBanner="TRUE"
120- TargetEnvironment="1"
121- TypeLibraryName=".\..\BuildTmp\Merge7zxxx___Win32_UnicodeDebug/Merge7zxxx.tlb"
122- HeaderFileName=""/>
123- <Tool
124- Name="VCPostBuildEventTool"/>
125- <Tool
126- Name="VCPreBuildEventTool"/>
127- <Tool
128- Name="VCPreLinkEventTool"/>
129- <Tool
130- Name="VCResourceCompilerTool"
131- PreprocessorDefinitions="_DEBUG"
132- Culture="1031"/>
133- <Tool
134- Name="VCWebServiceProxyGeneratorTool"/>
135- <Tool
136- Name="VCXMLDataGeneratorTool"/>
137- <Tool
138- Name="VCWebDeploymentTool"/>
139- <Tool
140- Name="VCManagedWrapperGeneratorTool"/>
141- <Tool
142- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
143- </Configuration>
144- <Configuration
145- Name="UnicodeRelease|Win32"
146- OutputDirectory=".\..\BuildTmp\Merge7zxxx___Win32_UnicodeRelease"
147- IntermediateDirectory=".\..\BuildTmp\Merge7zxxx___Win32_UnicodeRelease"
148- ConfigurationType="2"
149- UseOfMFC="0"
150- ATLMinimizesCRunTimeLibraryUsage="FALSE"
151- CharacterSet="1">
152- <Tool
153- Name="VCCLCompilerTool"
154- Optimization="1"
155- InlineFunctionExpansion="1"
156- AdditionalIncludeDirectories="../../Src/"
157- PreprocessorDefinitions="Merge7zxxx_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE"
158- StringPooling="TRUE"
159- RuntimeLibrary="0"
160- EnableFunctionLevelLinking="TRUE"
161- PrecompiledHeaderFile=".\..\BuildTmp\Merge7zxxx___Win32_UnicodeRelease/Merge7zxxx.pch"
162- AssemblerListingLocation=".\..\BuildTmp\Merge7zxxx___Win32_UnicodeRelease/"
163- ObjectFile=".\..\BuildTmp\Merge7zxxx___Win32_UnicodeRelease/"
164- ProgramDataBaseFileName=".\..\BuildTmp\Merge7zxxx___Win32_UnicodeRelease/"
165- WarningLevel="3"
166- SuppressStartupBanner="TRUE"
167- CompileAs="0"/>
168- <Tool
169- Name="VCCustomBuildTool"/>
170- <Tool
171- Name="VCLinkerTool"
172- AdditionalDependencies="shlwapi.lib odbc32.lib odbccp32.lib"
173- OutputFile="../../Build/MergeUnicodeRelease/Merge7zxxxU.dll"
174- LinkIncremental="1"
175- SuppressStartupBanner="TRUE"
176- ModuleDefinitionFile=".\Merge7z.def"
177- ImportLibrary=".\..\BuildTmp\Merge7zxxx___Win32_UnicodeRelease/Merge7zxxxU.lib"
178- TargetMachine="1"/>
179- <Tool
180- Name="VCMIDLTool"
181- PreprocessorDefinitions="NDEBUG"
182- MkTypLibCompatible="TRUE"
183- SuppressStartupBanner="TRUE"
184- TargetEnvironment="1"
185- TypeLibraryName=".\..\BuildTmp\Merge7zxxx___Win32_UnicodeRelease/Merge7zxxx.tlb"
186- HeaderFileName=""/>
187- <Tool
188- Name="VCPostBuildEventTool"/>
189- <Tool
190- Name="VCPreBuildEventTool"/>
191- <Tool
192- Name="VCPreLinkEventTool"/>
193- <Tool
194- Name="VCResourceCompilerTool"
195- PreprocessorDefinitions="NDEBUG"
196- Culture="1031"/>
197- <Tool
198- Name="VCWebServiceProxyGeneratorTool"/>
199- <Tool
200- Name="VCXMLDataGeneratorTool"/>
201- <Tool
202- Name="VCWebDeploymentTool"/>
203- <Tool
204- Name="VCManagedWrapperGeneratorTool"/>
205- <Tool
206- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
207- </Configuration>
208- <Configuration
209- Name="Debug|Win32"
210- OutputDirectory=".\..\BuildTmp\Merge7zxxx___Win32_Debug"
211- IntermediateDirectory=".\..\BuildTmp\Merge7zxxx___Win32_Debug"
212- ConfigurationType="2"
213- UseOfMFC="0"
214- ATLMinimizesCRunTimeLibraryUsage="FALSE"
215- CharacterSet="2">
216- <Tool
217- Name="VCCLCompilerTool"
218- Optimization="0"
219- AdditionalIncludeDirectories="../../Src/"
220- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;Merge7zxxx_EXPORTS"
221- BasicRuntimeChecks="3"
222- RuntimeLibrary="1"
223- PrecompiledHeaderFile=".\..\BuildTmp\Merge7zxxx___Win32_Debug/Merge7zxxx.pch"
224- AssemblerListingLocation=".\..\BuildTmp\Merge7zxxx___Win32_Debug/"
225- ObjectFile=".\..\BuildTmp\Merge7zxxx___Win32_Debug/"
226- ProgramDataBaseFileName=".\..\BuildTmp\Merge7zxxx___Win32_Debug/"
227- BrowseInformation="1"
228- WarningLevel="3"
229- SuppressStartupBanner="TRUE"
230- DebugInformationFormat="1"
231- CompileAs="0"/>
232- <Tool
233- Name="VCCustomBuildTool"/>
234- <Tool
235- Name="VCLinkerTool"
236- AdditionalDependencies="shlwapi.lib odbc32.lib odbccp32.lib"
237- OutputFile="../../Build/MergeDebug/Merge7zxxx.dll"
238- LinkIncremental="1"
239- SuppressStartupBanner="TRUE"
240- ModuleDefinitionFile=".\Merge7z.def"
241- GenerateDebugInformation="TRUE"
242- ProgramDatabaseFile="../../Build/MergeDebug/Merge7zxxx.pdb"
243- ImportLibrary=".\..\BuildTmp\Merge7zxxx___Win32_Debug/Merge7zxxx.lib"
244- TargetMachine="1"/>
245- <Tool
246- Name="VCMIDLTool"
247- PreprocessorDefinitions="_DEBUG"
248- MkTypLibCompatible="TRUE"
249- SuppressStartupBanner="TRUE"
250- TargetEnvironment="1"
251- TypeLibraryName=".\..\BuildTmp\Merge7zxxx___Win32_Debug/Merge7zxxx.tlb"
252- HeaderFileName=""/>
253- <Tool
254- Name="VCPostBuildEventTool"/>
255- <Tool
256- Name="VCPreBuildEventTool"/>
257- <Tool
258- Name="VCPreLinkEventTool"/>
259- <Tool
260- Name="VCResourceCompilerTool"
261- PreprocessorDefinitions="_DEBUG"
262- Culture="1031"/>
263- <Tool
264- Name="VCWebServiceProxyGeneratorTool"/>
265- <Tool
266- Name="VCXMLDataGeneratorTool"/>
267- <Tool
268- Name="VCWebDeploymentTool"/>
269- <Tool
270- Name="VCManagedWrapperGeneratorTool"/>
271- <Tool
272- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
273- </Configuration>
274- </Configurations>
275- <References>
276- </References>
277- <Files>
278- <File
279- RelativePath="Merge7z.def">
280- </File>
281- <File
282- RelativePath="Merge7z.h">
283- </File>
284- <File
285- RelativePath="Merge7zXXX.cpp">
286- <FileConfiguration
287- Name="Release|Win32">
288- <Tool
289- Name="VCCLCompilerTool"
290- Optimization="1"
291- AdditionalIncludeDirectories=""
292- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7zxxx_EXPORTS;$(NoInherit)"
293- BrowseInformation="1"/>
294- </FileConfiguration>
295- <FileConfiguration
296- Name="UnicodeDebug|Win32">
297- <Tool
298- Name="VCCLCompilerTool"
299- Optimization="0"
300- AdditionalIncludeDirectories=""
301- PreprocessorDefinitions="Merge7zxxx_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;$(NoInherit)"
302- BasicRuntimeChecks="3"
303- BrowseInformation="1"/>
304- </FileConfiguration>
305- <FileConfiguration
306- Name="UnicodeRelease|Win32">
307- <Tool
308- Name="VCCLCompilerTool"
309- Optimization="1"
310- AdditionalIncludeDirectories=""
311- PreprocessorDefinitions="Merge7zxxx_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;$(NoInherit)"/>
312- </FileConfiguration>
313- <FileConfiguration
314- Name="Debug|Win32">
315- <Tool
316- Name="VCCLCompilerTool"
317- Optimization="0"
318- AdditionalIncludeDirectories=""
319- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7zxxx_EXPORTS;$(NoInherit)"
320- BasicRuntimeChecks="3"
321- BrowseInformation="1"/>
322- </FileConfiguration>
323- </File>
324- <File
325- RelativePath="Merge7zxxx.rc">
326- <FileConfiguration
327- Name="UnicodeDebug|Win32">
328- <Tool
329- Name="VCResourceCompilerTool"
330- PreprocessorDefinitions="_DEBUG;$(NoInherit)"/>
331- </FileConfiguration>
332- <FileConfiguration
333- Name="UnicodeRelease|Win32">
334- <Tool
335- Name="VCResourceCompilerTool"
336- PreprocessorDefinitions="NDEBUG;$(NoInherit)"/>
337- </FileConfiguration>
338- </File>
339- <File
340- RelativePath="PipeIPC.cpp">
341- <FileConfiguration
342- Name="Release|Win32">
343- <Tool
344- Name="VCCLCompilerTool"
345- Optimization="1"
346- AdditionalIncludeDirectories=""
347- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7zxxx_EXPORTS;$(NoInherit)"
348- BrowseInformation="1"/>
349- </FileConfiguration>
350- <FileConfiguration
351- Name="UnicodeDebug|Win32">
352- <Tool
353- Name="VCCLCompilerTool"
354- Optimization="0"
355- AdditionalIncludeDirectories=""
356- PreprocessorDefinitions="Merge7zxxx_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;$(NoInherit)"
357- BasicRuntimeChecks="3"
358- BrowseInformation="1"/>
359- </FileConfiguration>
360- <FileConfiguration
361- Name="UnicodeRelease|Win32">
362- <Tool
363- Name="VCCLCompilerTool"
364- Optimization="1"
365- AdditionalIncludeDirectories=""
366- PreprocessorDefinitions="Merge7zxxx_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;$(NoInherit)"/>
367- </FileConfiguration>
368- <FileConfiguration
369- Name="Debug|Win32">
370- <Tool
371- Name="VCCLCompilerTool"
372- Optimization="0"
373- AdditionalIncludeDirectories=""
374- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7zxxx_EXPORTS;$(NoInherit)"
375- BasicRuntimeChecks="3"
376- BrowseInformation="1"/>
377- </FileConfiguration>
378- </File>
379- <File
380- RelativePath="PipeIPC.h">
381- </File>
382- <File
383- RelativePath="revision.txt">
384- </File>
385- <File
386- RelativePath="tools.cpp">
387- <FileConfiguration
388- Name="Release|Win32">
389- <Tool
390- Name="VCCLCompilerTool"
391- Optimization="1"
392- AdditionalIncludeDirectories=""
393- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7zxxx_EXPORTS;$(NoInherit)"
394- BrowseInformation="1"/>
395- </FileConfiguration>
396- <FileConfiguration
397- Name="UnicodeDebug|Win32">
398- <Tool
399- Name="VCCLCompilerTool"
400- Optimization="0"
401- AdditionalIncludeDirectories=""
402- PreprocessorDefinitions="Merge7zxxx_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;$(NoInherit)"
403- BasicRuntimeChecks="3"
404- BrowseInformation="1"/>
405- </FileConfiguration>
406- <FileConfiguration
407- Name="UnicodeRelease|Win32">
408- <Tool
409- Name="VCCLCompilerTool"
410- Optimization="1"
411- AdditionalIncludeDirectories=""
412- PreprocessorDefinitions="Merge7zxxx_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;$(NoInherit)"/>
413- </FileConfiguration>
414- <FileConfiguration
415- Name="Debug|Win32">
416- <Tool
417- Name="VCCLCompilerTool"
418- Optimization="0"
419- AdditionalIncludeDirectories=""
420- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7zxxx_EXPORTS;$(NoInherit)"
421- BasicRuntimeChecks="3"
422- BrowseInformation="1"/>
423- </FileConfiguration>
424- </File>
425- <File
426- RelativePath="tools.h">
427- </File>
428- </Files>
429- <Globals>
430- </Globals>
431-</VisualStudioProject>
1+<?xml version="1.0" encoding="shift_jis"?>
2+<VisualStudioProject
3+ ProjectType="Visual C++"
4+ Version="7.10"
5+ Name="Merge7zxxx"
6+ SccProjectName=""
7+ SccLocalPath="">
8+ <Platforms>
9+ <Platform
10+ Name="Win32"/>
11+ </Platforms>
12+ <Configurations>
13+ <Configuration
14+ Name="Release|Win32"
15+ OutputDirectory=".\..\BuildTmp\Merge7zxxx___Win32_Release"
16+ IntermediateDirectory=".\..\BuildTmp\Merge7zxxx___Win32_Release"
17+ ConfigurationType="2"
18+ UseOfMFC="0"
19+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
20+ CharacterSet="2">
21+ <Tool
22+ Name="VCCLCompilerTool"
23+ Optimization="1"
24+ InlineFunctionExpansion="1"
25+ AdditionalIncludeDirectories="../../Src/"
26+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;Merge7zxxx_EXPORTS"
27+ StringPooling="TRUE"
28+ RuntimeLibrary="0"
29+ EnableFunctionLevelLinking="TRUE"
30+ PrecompiledHeaderFile=".\..\BuildTmp\Merge7zxxx___Win32_Release/Merge7zxxx.pch"
31+ AssemblerListingLocation=".\..\BuildTmp\Merge7zxxx___Win32_Release/"
32+ ObjectFile=".\..\BuildTmp\Merge7zxxx___Win32_Release/"
33+ ProgramDataBaseFileName=".\..\BuildTmp\Merge7zxxx___Win32_Release/"
34+ BrowseInformation="1"
35+ WarningLevel="3"
36+ SuppressStartupBanner="TRUE"
37+ CompileAs="0"/>
38+ <Tool
39+ Name="VCCustomBuildTool"/>
40+ <Tool
41+ Name="VCLinkerTool"
42+ AdditionalDependencies="version.lib shlwapi.lib odbc32.lib odbccp32.lib"
43+ OutputFile="../../Build/MergeRelease/Merge7zxxx.dll"
44+ LinkIncremental="1"
45+ SuppressStartupBanner="TRUE"
46+ ModuleDefinitionFile=".\Merge7z.def"
47+ ImportLibrary=".\..\BuildTmp\Merge7zxxx___Win32_Release/Merge7zxxx.lib"
48+ TargetMachine="1"/>
49+ <Tool
50+ Name="VCMIDLTool"
51+ PreprocessorDefinitions="NDEBUG"
52+ MkTypLibCompatible="TRUE"
53+ SuppressStartupBanner="TRUE"
54+ TargetEnvironment="1"
55+ TypeLibraryName=".\..\BuildTmp\Merge7zxxx___Win32_Release/Merge7zxxx.tlb"
56+ HeaderFileName=""/>
57+ <Tool
58+ Name="VCPostBuildEventTool"/>
59+ <Tool
60+ Name="VCPreBuildEventTool"/>
61+ <Tool
62+ Name="VCPreLinkEventTool"/>
63+ <Tool
64+ Name="VCResourceCompilerTool"
65+ PreprocessorDefinitions="NDEBUG"
66+ Culture="1031"/>
67+ <Tool
68+ Name="VCWebServiceProxyGeneratorTool"/>
69+ <Tool
70+ Name="VCXMLDataGeneratorTool"/>
71+ <Tool
72+ Name="VCWebDeploymentTool"/>
73+ <Tool
74+ Name="VCManagedWrapperGeneratorTool"/>
75+ <Tool
76+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
77+ </Configuration>
78+ <Configuration
79+ Name="UnicodeDebug|Win32"
80+ OutputDirectory=".\..\BuildTmp\Merge7zxxx___Win32_UnicodeDebug"
81+ IntermediateDirectory=".\..\BuildTmp\Merge7zxxx___Win32_UnicodeDebug"
82+ ConfigurationType="2"
83+ UseOfMFC="0"
84+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
85+ CharacterSet="1">
86+ <Tool
87+ Name="VCCLCompilerTool"
88+ Optimization="0"
89+ AdditionalIncludeDirectories="../../Src/"
90+ PreprocessorDefinitions="Merge7zxxx_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE"
91+ BasicRuntimeChecks="3"
92+ RuntimeLibrary="1"
93+ PrecompiledHeaderFile=".\..\BuildTmp\Merge7zxxx___Win32_UnicodeDebug/Merge7zxxx.pch"
94+ AssemblerListingLocation=".\..\BuildTmp\Merge7zxxx___Win32_UnicodeDebug/"
95+ ObjectFile=".\..\BuildTmp\Merge7zxxx___Win32_UnicodeDebug/"
96+ ProgramDataBaseFileName=".\..\BuildTmp\Merge7zxxx___Win32_UnicodeDebug/"
97+ BrowseInformation="1"
98+ WarningLevel="3"
99+ SuppressStartupBanner="TRUE"
100+ DebugInformationFormat="1"
101+ CompileAs="0"/>
102+ <Tool
103+ Name="VCCustomBuildTool"/>
104+ <Tool
105+ Name="VCLinkerTool"
106+ AdditionalDependencies="version.lib shlwapi.lib odbc32.lib odbccp32.lib"
107+ OutputFile="../../Build/MergeUnicodeDebug/Merge7zxxxU.dll"
108+ LinkIncremental="1"
109+ SuppressStartupBanner="TRUE"
110+ ModuleDefinitionFile=".\Merge7z.def"
111+ GenerateDebugInformation="TRUE"
112+ ProgramDatabaseFile="../../Build/MergeUnicodeDebug/Merge7zxxxU.pdb"
113+ ImportLibrary=".\..\BuildTmp\Merge7zxxx___Win32_UnicodeDebug/Merge7zxxxU.lib"
114+ TargetMachine="1"/>
115+ <Tool
116+ Name="VCMIDLTool"
117+ PreprocessorDefinitions="_DEBUG"
118+ MkTypLibCompatible="TRUE"
119+ SuppressStartupBanner="TRUE"
120+ TargetEnvironment="1"
121+ TypeLibraryName=".\..\BuildTmp\Merge7zxxx___Win32_UnicodeDebug/Merge7zxxx.tlb"
122+ HeaderFileName=""/>
123+ <Tool
124+ Name="VCPostBuildEventTool"/>
125+ <Tool
126+ Name="VCPreBuildEventTool"/>
127+ <Tool
128+ Name="VCPreLinkEventTool"/>
129+ <Tool
130+ Name="VCResourceCompilerTool"
131+ PreprocessorDefinitions="_DEBUG"
132+ Culture="1031"/>
133+ <Tool
134+ Name="VCWebServiceProxyGeneratorTool"/>
135+ <Tool
136+ Name="VCXMLDataGeneratorTool"/>
137+ <Tool
138+ Name="VCWebDeploymentTool"/>
139+ <Tool
140+ Name="VCManagedWrapperGeneratorTool"/>
141+ <Tool
142+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
143+ </Configuration>
144+ <Configuration
145+ Name="UnicodeRelease|Win32"
146+ OutputDirectory=".\..\BuildTmp\Merge7zxxx___Win32_UnicodeRelease"
147+ IntermediateDirectory=".\..\BuildTmp\Merge7zxxx___Win32_UnicodeRelease"
148+ ConfigurationType="2"
149+ UseOfMFC="0"
150+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
151+ CharacterSet="1">
152+ <Tool
153+ Name="VCCLCompilerTool"
154+ Optimization="1"
155+ InlineFunctionExpansion="1"
156+ AdditionalIncludeDirectories="../../Src/"
157+ PreprocessorDefinitions="Merge7zxxx_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE"
158+ StringPooling="TRUE"
159+ RuntimeLibrary="0"
160+ EnableFunctionLevelLinking="TRUE"
161+ PrecompiledHeaderFile=".\..\BuildTmp\Merge7zxxx___Win32_UnicodeRelease/Merge7zxxx.pch"
162+ AssemblerListingLocation=".\..\BuildTmp\Merge7zxxx___Win32_UnicodeRelease/"
163+ ObjectFile=".\..\BuildTmp\Merge7zxxx___Win32_UnicodeRelease/"
164+ ProgramDataBaseFileName=".\..\BuildTmp\Merge7zxxx___Win32_UnicodeRelease/"
165+ WarningLevel="3"
166+ SuppressStartupBanner="TRUE"
167+ CompileAs="0"/>
168+ <Tool
169+ Name="VCCustomBuildTool"/>
170+ <Tool
171+ Name="VCLinkerTool"
172+ AdditionalDependencies="version.lib shlwapi.lib odbc32.lib odbccp32.lib"
173+ OutputFile="../../Build/MergeUnicodeRelease/Merge7zxxxU.dll"
174+ LinkIncremental="1"
175+ SuppressStartupBanner="TRUE"
176+ ModuleDefinitionFile=".\Merge7z.def"
177+ ImportLibrary=".\..\BuildTmp\Merge7zxxx___Win32_UnicodeRelease/Merge7zxxxU.lib"
178+ TargetMachine="1"/>
179+ <Tool
180+ Name="VCMIDLTool"
181+ PreprocessorDefinitions="NDEBUG"
182+ MkTypLibCompatible="TRUE"
183+ SuppressStartupBanner="TRUE"
184+ TargetEnvironment="1"
185+ TypeLibraryName=".\..\BuildTmp\Merge7zxxx___Win32_UnicodeRelease/Merge7zxxx.tlb"
186+ HeaderFileName=""/>
187+ <Tool
188+ Name="VCPostBuildEventTool"/>
189+ <Tool
190+ Name="VCPreBuildEventTool"/>
191+ <Tool
192+ Name="VCPreLinkEventTool"/>
193+ <Tool
194+ Name="VCResourceCompilerTool"
195+ PreprocessorDefinitions="NDEBUG"
196+ Culture="1031"/>
197+ <Tool
198+ Name="VCWebServiceProxyGeneratorTool"/>
199+ <Tool
200+ Name="VCXMLDataGeneratorTool"/>
201+ <Tool
202+ Name="VCWebDeploymentTool"/>
203+ <Tool
204+ Name="VCManagedWrapperGeneratorTool"/>
205+ <Tool
206+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
207+ </Configuration>
208+ <Configuration
209+ Name="Debug|Win32"
210+ OutputDirectory=".\..\BuildTmp\Merge7zxxx___Win32_Debug"
211+ IntermediateDirectory=".\..\BuildTmp\Merge7zxxx___Win32_Debug"
212+ ConfigurationType="2"
213+ UseOfMFC="0"
214+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
215+ CharacterSet="2">
216+ <Tool
217+ Name="VCCLCompilerTool"
218+ Optimization="0"
219+ AdditionalIncludeDirectories="../../Src/"
220+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;Merge7zxxx_EXPORTS"
221+ BasicRuntimeChecks="3"
222+ RuntimeLibrary="1"
223+ PrecompiledHeaderFile=".\..\BuildTmp\Merge7zxxx___Win32_Debug/Merge7zxxx.pch"
224+ AssemblerListingLocation=".\..\BuildTmp\Merge7zxxx___Win32_Debug/"
225+ ObjectFile=".\..\BuildTmp\Merge7zxxx___Win32_Debug/"
226+ ProgramDataBaseFileName=".\..\BuildTmp\Merge7zxxx___Win32_Debug/"
227+ BrowseInformation="1"
228+ WarningLevel="3"
229+ SuppressStartupBanner="TRUE"
230+ DebugInformationFormat="1"
231+ CompileAs="0"/>
232+ <Tool
233+ Name="VCCustomBuildTool"/>
234+ <Tool
235+ Name="VCLinkerTool"
236+ AdditionalDependencies="version.lib shlwapi.lib odbc32.lib odbccp32.lib"
237+ OutputFile="../../Build/MergeDebug/Merge7zxxx.dll"
238+ LinkIncremental="1"
239+ SuppressStartupBanner="TRUE"
240+ ModuleDefinitionFile=".\Merge7z.def"
241+ GenerateDebugInformation="TRUE"
242+ ProgramDatabaseFile="../../Build/MergeDebug/Merge7zxxx.pdb"
243+ ImportLibrary=".\..\BuildTmp\Merge7zxxx___Win32_Debug/Merge7zxxx.lib"
244+ TargetMachine="1"/>
245+ <Tool
246+ Name="VCMIDLTool"
247+ PreprocessorDefinitions="_DEBUG"
248+ MkTypLibCompatible="TRUE"
249+ SuppressStartupBanner="TRUE"
250+ TargetEnvironment="1"
251+ TypeLibraryName=".\..\BuildTmp\Merge7zxxx___Win32_Debug/Merge7zxxx.tlb"
252+ HeaderFileName=""/>
253+ <Tool
254+ Name="VCPostBuildEventTool"/>
255+ <Tool
256+ Name="VCPreBuildEventTool"/>
257+ <Tool
258+ Name="VCPreLinkEventTool"/>
259+ <Tool
260+ Name="VCResourceCompilerTool"
261+ PreprocessorDefinitions="_DEBUG"
262+ Culture="1031"/>
263+ <Tool
264+ Name="VCWebServiceProxyGeneratorTool"/>
265+ <Tool
266+ Name="VCXMLDataGeneratorTool"/>
267+ <Tool
268+ Name="VCWebDeploymentTool"/>
269+ <Tool
270+ Name="VCManagedWrapperGeneratorTool"/>
271+ <Tool
272+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
273+ </Configuration>
274+ </Configurations>
275+ <References>
276+ </References>
277+ <Files>
278+ <File
279+ RelativePath="Merge7z.def">
280+ </File>
281+ <File
282+ RelativePath="Merge7z.h">
283+ </File>
284+ <File
285+ RelativePath="Merge7zXXX.cpp">
286+ <FileConfiguration
287+ Name="Release|Win32">
288+ <Tool
289+ Name="VCCLCompilerTool"
290+ Optimization="1"
291+ AdditionalIncludeDirectories=""
292+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7zxxx_EXPORTS;$(NoInherit)"
293+ BrowseInformation="1"/>
294+ </FileConfiguration>
295+ <FileConfiguration
296+ Name="UnicodeDebug|Win32">
297+ <Tool
298+ Name="VCCLCompilerTool"
299+ Optimization="0"
300+ AdditionalIncludeDirectories=""
301+ PreprocessorDefinitions="Merge7zxxx_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;$(NoInherit)"
302+ BasicRuntimeChecks="3"
303+ BrowseInformation="1"/>
304+ </FileConfiguration>
305+ <FileConfiguration
306+ Name="UnicodeRelease|Win32">
307+ <Tool
308+ Name="VCCLCompilerTool"
309+ Optimization="1"
310+ AdditionalIncludeDirectories=""
311+ PreprocessorDefinitions="Merge7zxxx_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;$(NoInherit)"/>
312+ </FileConfiguration>
313+ <FileConfiguration
314+ Name="Debug|Win32">
315+ <Tool
316+ Name="VCCLCompilerTool"
317+ Optimization="0"
318+ AdditionalIncludeDirectories=""
319+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7zxxx_EXPORTS;$(NoInherit)"
320+ BasicRuntimeChecks="3"
321+ BrowseInformation="1"/>
322+ </FileConfiguration>
323+ </File>
324+ <File
325+ RelativePath="Merge7zxxx.rc">
326+ <FileConfiguration
327+ Name="UnicodeDebug|Win32">
328+ <Tool
329+ Name="VCResourceCompilerTool"
330+ PreprocessorDefinitions="_DEBUG;$(NoInherit)"/>
331+ </FileConfiguration>
332+ <FileConfiguration
333+ Name="UnicodeRelease|Win32">
334+ <Tool
335+ Name="VCResourceCompilerTool"
336+ PreprocessorDefinitions="NDEBUG;$(NoInherit)"/>
337+ </FileConfiguration>
338+ </File>
339+ <File
340+ RelativePath="PipeIPC.cpp">
341+ <FileConfiguration
342+ Name="Release|Win32">
343+ <Tool
344+ Name="VCCLCompilerTool"
345+ Optimization="1"
346+ AdditionalIncludeDirectories=""
347+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7zxxx_EXPORTS;$(NoInherit)"
348+ BrowseInformation="1"/>
349+ </FileConfiguration>
350+ <FileConfiguration
351+ Name="UnicodeDebug|Win32">
352+ <Tool
353+ Name="VCCLCompilerTool"
354+ Optimization="0"
355+ AdditionalIncludeDirectories=""
356+ PreprocessorDefinitions="Merge7zxxx_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;$(NoInherit)"
357+ BasicRuntimeChecks="3"
358+ BrowseInformation="1"/>
359+ </FileConfiguration>
360+ <FileConfiguration
361+ Name="UnicodeRelease|Win32">
362+ <Tool
363+ Name="VCCLCompilerTool"
364+ Optimization="1"
365+ AdditionalIncludeDirectories=""
366+ PreprocessorDefinitions="Merge7zxxx_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;$(NoInherit)"/>
367+ </FileConfiguration>
368+ <FileConfiguration
369+ Name="Debug|Win32">
370+ <Tool
371+ Name="VCCLCompilerTool"
372+ Optimization="0"
373+ AdditionalIncludeDirectories=""
374+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7zxxx_EXPORTS;$(NoInherit)"
375+ BasicRuntimeChecks="3"
376+ BrowseInformation="1"/>
377+ </FileConfiguration>
378+ </File>
379+ <File
380+ RelativePath="PipeIPC.h">
381+ </File>
382+ <File
383+ RelativePath="revision.txt">
384+ </File>
385+ <File
386+ RelativePath="tools.cpp">
387+ <FileConfiguration
388+ Name="Release|Win32">
389+ <Tool
390+ Name="VCCLCompilerTool"
391+ Optimization="1"
392+ AdditionalIncludeDirectories=""
393+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7zxxx_EXPORTS;$(NoInherit)"
394+ BrowseInformation="1"/>
395+ </FileConfiguration>
396+ <FileConfiguration
397+ Name="UnicodeDebug|Win32">
398+ <Tool
399+ Name="VCCLCompilerTool"
400+ Optimization="0"
401+ AdditionalIncludeDirectories=""
402+ PreprocessorDefinitions="Merge7zxxx_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;$(NoInherit)"
403+ BasicRuntimeChecks="3"
404+ BrowseInformation="1"/>
405+ </FileConfiguration>
406+ <FileConfiguration
407+ Name="UnicodeRelease|Win32">
408+ <Tool
409+ Name="VCCLCompilerTool"
410+ Optimization="1"
411+ AdditionalIncludeDirectories=""
412+ PreprocessorDefinitions="Merge7zxxx_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE;_UNICODE;$(NoInherit)"/>
413+ </FileConfiguration>
414+ <FileConfiguration
415+ Name="Debug|Win32">
416+ <Tool
417+ Name="VCCLCompilerTool"
418+ Optimization="0"
419+ AdditionalIncludeDirectories=""
420+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;Merge7zxxx_EXPORTS;$(NoInherit)"
421+ BasicRuntimeChecks="3"
422+ BrowseInformation="1"/>
423+ </FileConfiguration>
424+ </File>
425+ <File
426+ RelativePath="tools.h">
427+ </File>
428+ </Files>
429+ <Globals>
430+ </Globals>
431+</VisualStudioProject>
--- a/SetVersion.cmd
+++ b/SetVersion.cmd
@@ -1,8 +1,8 @@
11 set MAJOR=2
22 set MINOR=13
33 set REVISION=13
4-set PATCHLEVEL=7
5-set PRIVATEBUILD=jp-7
4+set PATCHLEVEL=8
5+set PRIVATEBUILD=jp-8
66
77 set RCVER=%MAJOR%.%MINOR%.%REVISION%.%PATCHLEVEL%
88 rem set STRVER=%MAJOR%.%MINOR%.%REVISION%.%PATCHLEVEL%
--- a/Version.h
+++ b/Version.h
@@ -1,4 +1,4 @@
1-#define FILEVER 2,13,13,7
2-#define PRODUCTVER 2,13,13,7
3-#define STRFILEVER "2.13.13.7+-jp-7"
4-#define STRPRODUCTVER "2.13.13.7+-jp-7"
1+#define FILEVER 2,13,13,8
2+#define PRODUCTVER 2,13,13,8
3+#define STRFILEVER "2.13.13.8+-jp-8"
4+#define STRPRODUCTVER "2.13.13.8+-jp-8"
Show on old repository browser