Update VS8.0 build files, using the script vs9to8.py.
Also remove references to odbc libraries, which are not shipped with vs2003 express.
(and certainly not useful)
diff --git a/PCbuild/_elementtree.vcproj b/PCbuild/_elementtree.vcproj
index c22c252..b308c18 100644
--- a/PCbuild/_elementtree.vcproj
+++ b/PCbuild/_elementtree.vcproj
@@ -56,7 +56,6 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
BaseAddress="0x1D100000"
/>
<Tool
@@ -119,7 +118,6 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
BaseAddress="0x1D100000"
/>
<Tool
@@ -182,7 +180,6 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
BaseAddress="0x1D100000"
/>
<Tool
@@ -246,7 +243,6 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
BaseAddress="0x1D100000"
/>
<Tool
@@ -309,7 +305,6 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
BaseAddress="0x1D100000"
/>
<Tool
@@ -373,7 +368,6 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
BaseAddress="0x1D100000"
TargetMachine="17"
/>
@@ -437,7 +431,6 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
BaseAddress="0x1D100000"
/>
<Tool
@@ -501,7 +494,6 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
BaseAddress="0x1D100000"
TargetMachine="17"
/>
diff --git a/PCbuild/make_versioninfo.vcproj b/PCbuild/make_versioninfo.vcproj
index dcb922b..e2b86c7 100644
--- a/PCbuild/make_versioninfo.vcproj
+++ b/PCbuild/make_versioninfo.vcproj
@@ -67,7 +67,6 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
OutputFile="$(SolutionDir)make_versioninfo.exe"
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
SubSystem="1"
@@ -211,7 +210,6 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
OutputFile="$(SolutionDir)make_versioninfo_d.exe"
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
SubSystem="1"
diff --git a/PCbuild/python.vcproj b/PCbuild/python.vcproj
index f5f4605..85d2d9e 100644
--- a/PCbuild/python.vcproj
+++ b/PCbuild/python.vcproj
@@ -62,7 +62,6 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
OutputFile="$(OutDir)\python.exe"
SubSystem="1"
StackReserveSize="2000000"
@@ -136,7 +135,6 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
OutputFile="$(OutDir)\python.exe"
SubSystem="1"
StackReserveSize="2000000"
@@ -211,7 +209,6 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
OutputFile="$(OutDir)\python_d.exe"
SubSystem="1"
StackReserveSize="2000000"
@@ -287,7 +284,6 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
OutputFile="$(OutDir)\python_d.exe"
SubSystem="1"
StackReserveSize="2100000"
@@ -360,7 +356,6 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
OutputFile="$(OutDir)\python.exe"
SubSystem="1"
StackReserveSize="2000000"
@@ -435,7 +430,6 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
OutputFile="$(OutDir)\python.exe"
SubSystem="1"
StackReserveSize="2000000"
@@ -510,7 +504,6 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
OutputFile="$(OutDir)\python.exe"
SubSystem="1"
StackReserveSize="2000000"
@@ -585,7 +578,6 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
OutputFile="$(OutDir)\python.exe"
SubSystem="1"
StackReserveSize="2000000"
diff --git a/PCbuild/vs9to8.py b/PCbuild/vs9to8.py
index b31ed61..c59dea4 100644
--- a/PCbuild/vs9to8.py
+++ b/PCbuild/vs9to8.py
@@ -22,6 +22,12 @@
lines = lines.replace('..\\', '..\\..\\')
lines = lines.replace('..\\..\\..\\..\\', '..\\..\\..\\')
+ # Bah. VS8.0 does not expand macros in file names.
+ # Replace them here.
+ lines = lines.replace('$(sqlite3Dir)', '..\\..\\..\\sqlite-source-3.3.4')
+ lines = lines.replace('$(bsddbDir)\\..\\..', '..\\..\\..\\db-4.4.20\\build_win32\\..')
+ lines = lines.replace('$(bsddbDir)', '..\\..\\..\\db-4.4.20\\build_win32')
+
with open(destname, 'wb') as fout:
lines = lines.replace("\n", "\r\n")
fout.write(lines)