Skip to content

Commit 5bf096b

Browse files
aleks-faleks-f
committed
- SF [1800596] VS Solutions (ver. 8.0 and 9.0)
- SF [1621372] Build Scripts (all Windows scripts consolidated in one) - eliminated warnings in sqlite3.c - updated components file
1 parent 4873d0d commit 5bf096b

148 files changed

Lines changed: 17180 additions & 670 deletions

File tree

Some content is hidden

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

‎ApacheConnector/samples/FormServer/FormServer_vs90.vcproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
Name="VCLinkerTool"
7070
IgnoreImportLibrary="true"
7171
AdditionalDependencies="PocoFoundationd.lib"
72-
OutputFile="bin\FormServerd.dll"
72+
OutputFile="bin\$(ProjectName)d.dll"
7373
LinkIncremental="2"
7474
AdditionalLibraryDirectories="..\..\..\lib"
7575
GenerateDebugInformation="true"
@@ -158,7 +158,7 @@
158158
Name="VCLinkerTool"
159159
IgnoreImportLibrary="true"
160160
AdditionalDependencies="PocoFoundation.lib"
161-
OutputFile="bin\FormServer.dll"
161+
OutputFile="bin\$(ProjectName).dll"
162162
LinkIncremental="1"
163163
AdditionalLibraryDirectories="..\..\..\lib"
164164
GenerateDebugInformation="false"

‎ApacheConnector/samples/TimeServer/TimeServer_vs90.vcproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
Name="VCLinkerTool"
7070
IgnoreImportLibrary="true"
7171
AdditionalDependencies="PocoFoundationd.lib"
72-
OutputFile="bin\TimeServerd.dll"
72+
OutputFile="bin\$(ProjectName)d.dll"
7373
LinkIncremental="2"
7474
AdditionalLibraryDirectories="..\..\..\lib"
7575
GenerateDebugInformation="true"
@@ -158,7 +158,7 @@
158158
Name="VCLinkerTool"
159159
IgnoreImportLibrary="true"
160160
AdditionalDependencies="PocoFoundation.lib"
161-
OutputFile="bin\TimeServer.dll"
161+
OutputFile="bin\$(ProjectName).dll"
162162
LinkIncremental="1"
163163
AdditionalLibraryDirectories="..\..\..\lib"
164164
GenerateDebugInformation="false"

‎CppUnit/CppUnit_vs80.vcproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,13 @@
8484
<Tool
8585
Name="VCLinkerTool"
8686
ShowProgress="0"
87-
OutputFile="..\bin\CppUnitd.dll"
87+
OutputFile="..\bin\$(ProjectName)d.dll"
8888
LinkIncremental="2"
8989
SuppressStartupBanner="true"
9090
AdditionalLibraryDirectories=""
9191
GenerateDebugInformation="true"
9292
ProgramDatabaseFile="..\bin\CppUnitd.pdb"
93-
ImportLibrary="..\lib\CppUnitd.lib"
93+
ImportLibrary="..\lib\$(Projectname)d.lib"
9494
TargetMachine="1"
9595
/>
9696
<Tool
@@ -186,12 +186,12 @@
186186
/>
187187
<Tool
188188
Name="VCLinkerTool"
189-
OutputFile="..\bin\CppUnit.dll"
189+
OutputFile="..\bin\$(ProjectName).dll"
190190
LinkIncremental="1"
191191
SuppressStartupBanner="true"
192192
AdditionalLibraryDirectories=""
193193
ProgramDatabaseFile=""
194-
ImportLibrary="..\lib\CppUnit.lib"
194+
ImportLibrary="..\lib\$(Projectname).lib"
195195
TargetMachine="1"
196196
/>
197197
<Tool
@@ -288,7 +288,7 @@
288288
/>
289289
<Tool
290290
Name="VCLibrarianTool"
291-
OutputFile="..\lib\CppUnitmtd.lib"
291+
OutputFile="..\lib\$(ProjectName)mtd.lib"
292292
/>
293293
<Tool
294294
Name="VCALinkTool"
@@ -374,7 +374,7 @@
374374
/>
375375
<Tool
376376
Name="VCLibrarianTool"
377-
OutputFile="..\lib\CppUnitmt.lib"
377+
OutputFile="..\lib\$(ProjectName)mt.lib"
378378
/>
379379
<Tool
380380
Name="VCALinkTool"

‎CppUnit/CppUnit_vs90.vcproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
<Tool
8383
Name="VCLinkerTool"
8484
ShowProgress="0"
85-
OutputFile="..\bin\CppUnitd.dll"
85+
OutputFile="..\bin\$(ProjectName)d.dll"
8686
LinkIncremental="2"
8787
SuppressStartupBanner="true"
8888
AdditionalLibraryDirectories=""
@@ -181,7 +181,7 @@
181181
/>
182182
<Tool
183183
Name="VCLinkerTool"
184-
OutputFile="..\bin\CppUnit.dll"
184+
OutputFile="..\bin\$(ProjectName).dll"
185185
LinkIncremental="1"
186186
SuppressStartupBanner="true"
187187
AdditionalLibraryDirectories=""
@@ -280,7 +280,7 @@
280280
/>
281281
<Tool
282282
Name="VCLibrarianTool"
283-
OutputFile="..\lib\CppUnitmtd.lib"
283+
OutputFile="..\lib\$(ProjectName)mtd.lib"
284284
/>
285285
<Tool
286286
Name="VCALinkTool"
@@ -364,7 +364,7 @@
364364
/>
365365
<Tool
366366
Name="VCLibrarianTool"
367-
OutputFile="..\lib\CppUnitmt.lib"
367+
OutputFile="..\lib\$(ProjectName)mt.lib"
368368
/>
369369
<Tool
370370
Name="VCALinkTool"

‎CppUnit/WinTestRunner/WinTestRunner_vs80.vcproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="Windows-1252"?>
22
<VisualStudioProject
33
ProjectType="Visual C++"
4-
Version="8,00"
4+
Version="8.00"
55
Name="WinTestRunner"
66
ProjectGUID="{BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}"
77
Keyword="MFCProj"
@@ -82,7 +82,7 @@
8282
<Tool
8383
Name="VCLinkerTool"
8484
AdditionalDependencies="cppunit.lib winmm.lib"
85-
OutputFile="..\..\bin\WinTestRunner.dll"
85+
OutputFile="..\..\bin\$(ProjectName).dll"
8686
LinkIncremental="1"
8787
SuppressStartupBanner="true"
8888
AdditionalLibraryDirectories="..\..\lib"
@@ -186,7 +186,7 @@
186186
Name="VCLinkerTool"
187187
AdditionalDependencies="cppunitd.lib winmm.lib"
188188
ShowProgress="0"
189-
OutputFile="..\..\bin\WinTestRunnerd.dll"
189+
OutputFile="..\..\bin\$(ProjectName)d.dll"
190190
LinkIncremental="2"
191191
SuppressStartupBanner="true"
192192
AdditionalLibraryDirectories="..\..\lib"
@@ -289,7 +289,7 @@
289289
/>
290290
<Tool
291291
Name="VCLibrarianTool"
292-
OutputFile="..\..\lib\WinTestRunnermtd.lib"
292+
OutputFile="..\..\lib\$(ProjectName)mtd.lib"
293293
/>
294294
<Tool
295295
Name="VCALinkTool"
@@ -374,7 +374,7 @@
374374
/>
375375
<Tool
376376
Name="VCLibrarianTool"
377-
OutputFile="..\..\lib\WinTestRunnermt.lib"
377+
OutputFile="..\..\lib\$(ProjectName)mt.lib"
378378
/>
379379
<Tool
380380
Name="VCALinkTool"

‎CppUnit/WinTestRunner/WinTestRunner_vs90.vcproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
<Tool
8181
Name="VCLinkerTool"
8282
AdditionalDependencies="cppunit.lib winmm.lib"
83-
OutputFile="..\..\bin\WinTestRunner.dll"
83+
OutputFile="..\..\bin\$(ProjectName).dll"
8484
LinkIncremental="1"
8585
SuppressStartupBanner="true"
8686
AdditionalLibraryDirectories="..\..\lib"
@@ -181,7 +181,7 @@
181181
Name="VCLinkerTool"
182182
AdditionalDependencies="cppunitd.lib winmm.lib"
183183
ShowProgress="0"
184-
OutputFile="..\..\bin\WinTestRunnerd.dll"
184+
OutputFile="..\..\bin\$(ProjectName)d.dll"
185185
LinkIncremental="2"
186186
SuppressStartupBanner="true"
187187
AdditionalLibraryDirectories="..\..\lib"
@@ -281,7 +281,7 @@
281281
/>
282282
<Tool
283283
Name="VCLibrarianTool"
284-
OutputFile="..\..\lib\WinTestRunnermtd.lib"
284+
OutputFile="..\..\lib\$(ProjectName)mtd.lib"
285285
/>
286286
<Tool
287287
Name="VCALinkTool"
@@ -364,7 +364,7 @@
364364
/>
365365
<Tool
366366
Name="VCLibrarianTool"
367-
OutputFile="..\..\lib\WinTestRunnermt.lib"
367+
OutputFile="..\..\lib\$(ProjectName)mt.lib"
368368
/>
369369
<Tool
370370
Name="VCALinkTool"

‎Data/Data_VS80.sln‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Microsoft Visual Studio Solution File, Format Version 9.00
2-
# Visual Studio 2005
2+
# Visual C++ Express 2005
33
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Data", "Data_VS80.vcproj", "{240E83C3-368D-11DB-9FBC-00123FC423B5}"
44
EndProject
55
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_VS80.vcproj", "{24134877-368D-11DB-9FBC-00123FC423B5}"
@@ -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
{240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
1719
{240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|Win32.Build.0 = debug_shared|Win32
20+
{240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static|Win32.ActiveCfg = debug_static|Win32
21+
{240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static|Win32.Build.0 = debug_static|Win32
1822
{240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|Win32.ActiveCfg = release_shared|Win32
1923
{240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|Win32.Build.0 = release_shared|Win32
24+
{240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static|Win32.ActiveCfg = release_static|Win32
25+
{240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static|Win32.Build.0 = release_static|Win32
2026
{24134877-368D-11DB-9FBC-00123FC423B5}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
2127
{24134877-368D-11DB-9FBC-00123FC423B5}.debug_shared|Win32.Build.0 = debug_shared|Win32
28+
{24134877-368D-11DB-9FBC-00123FC423B5}.debug_static|Win32.ActiveCfg = debug_static|Win32
29+
{24134877-368D-11DB-9FBC-00123FC423B5}.debug_static|Win32.Build.0 = debug_static|Win32
2230
{24134877-368D-11DB-9FBC-00123FC423B5}.release_shared|Win32.ActiveCfg = release_shared|Win32
2331
{24134877-368D-11DB-9FBC-00123FC423B5}.release_shared|Win32.Build.0 = release_shared|Win32
32+
{24134877-368D-11DB-9FBC-00123FC423B5}.release_static|Win32.ActiveCfg = release_static|Win32
33+
{24134877-368D-11DB-9FBC-00123FC423B5}.release_static|Win32.Build.0 = release_static|Win32
2434
EndGlobalSection
2535
GlobalSection(SolutionProperties) = preSolution
2636
HideSolutionNode = FALSE

0 commit comments

Comments
 (0)