Skip to content

Commit 15193c3

Browse files
committed
sources from main repository
1 parent 7781215 commit 15193c3

42 files changed

Lines changed: 690 additions & 44 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CppUnit/CppUnit_vs71.sln‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,29 @@ EndProject
1111
Global
1212
GlobalSection(SolutionConfiguration) = preSolution
1313
debug_shared = debug_shared
14+
debug_static = debug_static
1415
release_shared = release_shared
16+
release_static = release_static
17+
EndGlobalSection
18+
GlobalSection(ProjectDependencies) = postSolution
1519
EndGlobalSection
1620
GlobalSection(ProjectConfiguration) = postSolution
1721
{138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared.ActiveCfg = debug_shared|Win32
1822
{138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared.Build.0 = debug_shared|Win32
23+
{138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static.ActiveCfg = debug_static|Win32
24+
{138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static.Build.0 = debug_static|Win32
1925
{138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared.ActiveCfg = release_shared|Win32
2026
{138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared.Build.0 = release_shared|Win32
27+
{138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static.ActiveCfg = release_static|Win32
28+
{138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static.Build.0 = release_static|Win32
2129
{BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_shared.ActiveCfg = debug_shared|Win32
2230
{BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_shared.Build.0 = debug_shared|Win32
31+
{BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_static.ActiveCfg = debug_static|Win32
32+
{BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_static.Build.0 = debug_static|Win32
2333
{BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_shared.ActiveCfg = release_shared|Win32
2434
{BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_shared.Build.0 = release_shared|Win32
35+
{BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_static.ActiveCfg = release_static|Win32
36+
{BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_static.Build.0 = release_static|Win32
2537
EndGlobalSection
2638
GlobalSection(ExtensibilityGlobals) = postSolution
2739
EndGlobalSection

‎CppUnit/CppUnit_vs71.vcproj‎

Lines changed: 139 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
Version="7.10"
55
Name="CppUnit"
66
ProjectGUID="{138BB448-808A-4FE5-A66D-78D1F8770F59}"
7-
SccProjectName="CppUnit"
8-
SccLocalPath="."
97
Keyword="MFCProj">
108
<Platforms>
119
<Platform
@@ -157,6 +155,133 @@
157155
<Tool
158156
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
159157
</Configuration>
158+
<Configuration
159+
Name="debug_static|Win32"
160+
OutputDirectory=".\obj\debug_static"
161+
IntermediateDirectory=".\obj\debug_static"
162+
ConfigurationType="4"
163+
UseOfMFC="0"
164+
ATLMinimizesCRunTimeLibraryUsage="FALSE"
165+
CharacterSet="2">
166+
<Tool
167+
Name="VCCLCompilerTool"
168+
Optimization="0"
169+
InlineFunctionExpansion="0"
170+
EnableIntrinsicFunctions="FALSE"
171+
AdditionalIncludeDirectories="include"
172+
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_STATIC"
173+
StringPooling="TRUE"
174+
BasicRuntimeChecks="3"
175+
RuntimeLibrary="3"
176+
BufferSecurityCheck="TRUE"
177+
TreatWChar_tAsBuiltInType="TRUE"
178+
ForceConformanceInForLoopScope="TRUE"
179+
RuntimeTypeInfo="TRUE"
180+
PrecompiledHeaderFile=""
181+
AssemblerListingLocation=""
182+
ObjectFile="$(IntDir)/"
183+
ProgramDataBaseFileName="$(IntDir)/vc70.pdb"
184+
WarningLevel="3"
185+
SuppressStartupBanner="TRUE"
186+
Detect64BitPortabilityProblems="TRUE"
187+
DebugInformationFormat="4"
188+
CompileAs="0"
189+
ShowIncludes="FALSE"/>
190+
<Tool
191+
Name="VCCustomBuildTool"/>
192+
<Tool
193+
Name="VCLibrarianTool"
194+
OutputFile="..\lib\CppUnitmtd.lib"/>
195+
<Tool
196+
Name="VCMIDLTool"
197+
PreprocessorDefinitions="_DEBUG"
198+
MkTypLibCompatible="TRUE"
199+
SuppressStartupBanner="TRUE"
200+
TargetEnvironment="1"
201+
TypeLibraryName=".\lib/CppUnit.tlb"
202+
HeaderFileName=""/>
203+
<Tool
204+
Name="VCPostBuildEventTool"/>
205+
<Tool
206+
Name="VCPreBuildEventTool"/>
207+
<Tool
208+
Name="VCPreLinkEventTool"/>
209+
<Tool
210+
Name="VCResourceCompilerTool"
211+
PreprocessorDefinitions="_DEBUG"
212+
Culture="3079"/>
213+
<Tool
214+
Name="VCWebServiceProxyGeneratorTool"/>
215+
<Tool
216+
Name="VCXMLDataGeneratorTool"/>
217+
<Tool
218+
Name="VCManagedWrapperGeneratorTool"/>
219+
<Tool
220+
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
221+
</Configuration>
222+
<Configuration
223+
Name="release_static|Win32"
224+
OutputDirectory=".\obj\release_static"
225+
IntermediateDirectory=".\obj\release_static"
226+
ConfigurationType="4"
227+
UseOfMFC="0"
228+
ATLMinimizesCRunTimeLibraryUsage="FALSE"
229+
CharacterSet="2">
230+
<Tool
231+
Name="VCCLCompilerTool"
232+
Optimization="4"
233+
InlineFunctionExpansion="1"
234+
EnableIntrinsicFunctions="TRUE"
235+
FavorSizeOrSpeed="1"
236+
OmitFramePointers="TRUE"
237+
AdditionalIncludeDirectories="include"
238+
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_AFXDLL;POCO_STATIC;CppUnit_EXPORTS"
239+
StringPooling="TRUE"
240+
RuntimeLibrary="2"
241+
BufferSecurityCheck="FALSE"
242+
TreatWChar_tAsBuiltInType="TRUE"
243+
ForceConformanceInForLoopScope="TRUE"
244+
RuntimeTypeInfo="TRUE"
245+
PrecompiledHeaderFile=""
246+
AssemblerListingLocation=""
247+
ObjectFile="$(IntDir)/"
248+
ProgramDataBaseFileName="$(IntDir)/vc70.pdb"
249+
WarningLevel="3"
250+
SuppressStartupBanner="TRUE"
251+
Detect64BitPortabilityProblems="TRUE"
252+
CompileAs="0"/>
253+
<Tool
254+
Name="VCCustomBuildTool"/>
255+
<Tool
256+
Name="VCLibrarianTool"
257+
OutputFile="..\lib\CppUnitmt.lib"/>
258+
<Tool
259+
Name="VCMIDLTool"
260+
PreprocessorDefinitions="NDEBUG"
261+
MkTypLibCompatible="TRUE"
262+
SuppressStartupBanner="TRUE"
263+
TargetEnvironment="1"
264+
TypeLibraryName=".\lib/CppUnit.tlb"
265+
HeaderFileName=""/>
266+
<Tool
267+
Name="VCPostBuildEventTool"/>
268+
<Tool
269+
Name="VCPreBuildEventTool"/>
270+
<Tool
271+
Name="VCPreLinkEventTool"/>
272+
<Tool
273+
Name="VCResourceCompilerTool"
274+
PreprocessorDefinitions="NDEBUG"
275+
Culture="3079"/>
276+
<Tool
277+
Name="VCWebServiceProxyGeneratorTool"/>
278+
<Tool
279+
Name="VCXMLDataGeneratorTool"/>
280+
<Tool
281+
Name="VCManagedWrapperGeneratorTool"/>
282+
<Tool
283+
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
284+
</Configuration>
160285
</Configurations>
161286
<References>
162287
</References>
@@ -178,6 +303,18 @@
178303
Name="VCCLCompilerTool"
179304
ObjectFile="$(IntDir)/$(InputName)1.obj"/>
180305
</FileConfiguration>
306+
<FileConfiguration
307+
Name="debug_static|Win32">
308+
<Tool
309+
Name="VCCLCompilerTool"
310+
ObjectFile="$(IntDir)/$(InputName)1.obj"/>
311+
</FileConfiguration>
312+
<FileConfiguration
313+
Name="release_static|Win32">
314+
<Tool
315+
Name="VCCLCompilerTool"
316+
ObjectFile="$(IntDir)/$(InputName)1.obj"/>
317+
</FileConfiguration>
181318
</File>
182319
<File
183320
RelativePath="src\TestCase.cpp">

‎CppUnit/CppUnit_vs80.sln‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,27 @@ EndProject
1010
Global
1111
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1212
debug_shared|Win32 = debug_shared|Win32
13+
debug_static|Win32 = debug_static|Win32
1314
release_shared|Win32 = release_shared|Win32
15+
release_static|Win32 = release_static|Win32
1416
EndGlobalSection
1517
GlobalSection(ProjectConfigurationPlatforms) = postSolution
1618
{138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
1719
{138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|Win32.Build.0 = debug_shared|Win32
20+
{138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static|Win32.ActiveCfg = debug_static|Win32
21+
{138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static|Win32.Build.0 = debug_static|Win32
1822
{138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|Win32.ActiveCfg = release_shared|Win32
1923
{138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|Win32.Build.0 = release_shared|Win32
24+
{138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static|Win32.ActiveCfg = release_static|Win32
25+
{138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static|Win32.Build.0 = release_static|Win32
2026
{BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
2127
{BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_shared|Win32.Build.0 = debug_shared|Win32
28+
{BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_static|Win32.ActiveCfg = debug_static|Win32
29+
{BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_static|Win32.Build.0 = debug_static|Win32
2230
{BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_shared|Win32.ActiveCfg = release_shared|Win32
2331
{BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_shared|Win32.Build.0 = release_shared|Win32
32+
{BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_static|Win32.ActiveCfg = release_static|Win32
33+
{BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_static|Win32.Build.0 = release_static|Win32
2434
EndGlobalSection
2535
GlobalSection(SolutionProperties) = preSolution
2636
HideSolutionNode = FALSE

0 commit comments

Comments
 (0)