Patch #1006916: Remove ODBC library references.
diff --git a/PCbuild/_bsddb.vcproj b/PCbuild/_bsddb.vcproj
index fc3a5f9..c1298ab 100644
--- a/PCbuild/_bsddb.vcproj
+++ b/PCbuild/_bsddb.vcproj
@@ -36,7 +36,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbc32.lib odbccp32.lib ..\..\db-4.2.52\build_win32\Debug_static\libdb42sd.lib"
+ AdditionalDependencies="..\..\db-4.2.52\build_win32\Debug_static\libdb42sd.lib"
OutputFile="./_bsddb_d.pyd"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
@@ -105,7 +105,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbc32.lib odbccp32.lib ..\..\db-4.2.52\build_win32\Release_static\libdb42s.lib"
+ AdditionalDependencies="..\..\db-4.2.52\build_win32\Release_static\libdb42s.lib"
OutputFile="./_bsddb.pyd"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
@@ -179,7 +179,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK"
- AdditionalDependencies="odbc32.lib odbccp32.lib ..\..\db-4.2.52\build_win32\Release_static\libdb42s.lib"
+ AdditionalDependencies="..\..\db-4.2.52\build_win32\Release_static\libdb42s.lib"
OutputFile="./_bsddb.pyd"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
diff --git a/PCbuild/_socket.vcproj b/PCbuild/_socket.vcproj
index 46d303d..5e1ce72 100644
--- a/PCbuild/_socket.vcproj
+++ b/PCbuild/_socket.vcproj
@@ -36,7 +36,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbc32.lib odbccp32.lib wsock32.lib"
+ AdditionalDependencies="wsock32.lib"
OutputFile="./_socket_d.pyd"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
@@ -104,7 +104,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbc32.lib odbccp32.lib wsock32.lib"
+ AdditionalDependencies="wsock32.lib"
OutputFile="./_socket.pyd"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
@@ -177,7 +177,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK"
- AdditionalDependencies="odbc32.lib odbccp32.lib wsock32.lib"
+ AdditionalDependencies="wsock32.lib"
OutputFile="./_socket.pyd"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
diff --git a/PCbuild/_tkinter.vcproj b/PCbuild/_tkinter.vcproj
index a80c173..a2405f1 100644
--- a/PCbuild/_tkinter.vcproj
+++ b/PCbuild/_tkinter.vcproj
@@ -39,7 +39,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="..\..\tcl84\lib\tk84.lib ..\..\tcl84\lib\tcl84.lib odbc32.lib odbccp32.lib"
+ AdditionalDependencies="..\..\tcl84\lib\tk84.lib ..\..\tcl84\lib\tcl84.lib odbccp32.lib"
OutputFile="./_tkinter.pyd"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
@@ -105,7 +105,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="..\..\tcl84\lib\tk84.lib ..\..\tcl84\lib\tcl84.lib odbc32.lib odbccp32.lib"
+ AdditionalDependencies="..\..\tcl84\lib\tk84.lib ..\..\tcl84\lib\tcl84.lib odbccp32.lib"
OutputFile="./_tkinter_d.pyd"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
@@ -179,7 +179,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK"
- AdditionalDependencies="..\..\tcl84\lib\tk84.lib ..\..\tcl84\lib\tcl84.lib odbc32.lib odbccp32.lib"
+ AdditionalDependencies="..\..\tcl84\lib\tk84.lib ..\..\tcl84\lib\tcl84.lib odbccp32.lib"
OutputFile="./_tkinter.pyd"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
diff --git a/PCbuild/make_versioninfo.vcproj b/PCbuild/make_versioninfo.vcproj
index d847126..8a3cba7 100644
--- a/PCbuild/make_versioninfo.vcproj
+++ b/PCbuild/make_versioninfo.vcproj
@@ -44,7 +44,7 @@
Outputs="..\PC\pythonnt_rc.h"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbc32.lib odbccp32.lib"
+ AdditionalDependencies="odbccp32.lib"
OutputFile=".\./make_versioninfo.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
@@ -110,7 +110,7 @@
Outputs="..\PC\pythonnt_rc_d.h"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbc32.lib odbccp32.lib"
+ AdditionalDependencies="odbccp32.lib"
OutputFile="./make_versioninfo_d.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
diff --git a/PCbuild/pyexpat.vcproj b/PCbuild/pyexpat.vcproj
index 3bbb891..deb0cfb 100644
--- a/PCbuild/pyexpat.vcproj
+++ b/PCbuild/pyexpat.vcproj
@@ -36,7 +36,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbc32.lib odbccp32.lib"
+ AdditionalDependencies="odbccp32.lib"
OutputFile="./pyexpat_d.pyd"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
@@ -104,7 +104,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbc32.lib odbccp32.lib"
+ AdditionalDependencies="odbccp32.lib"
OutputFile="./pyexpat.pyd"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
@@ -177,7 +177,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK"
- AdditionalDependencies="odbc32.lib odbccp32.lib"
+ AdditionalDependencies="odbccp32.lib"
OutputFile="./pyexpat.pyd"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
diff --git a/PCbuild/python.vcproj b/PCbuild/python.vcproj
index 7d13c43..0c3c4b6 100644
--- a/PCbuild/python.vcproj
+++ b/PCbuild/python.vcproj
@@ -40,7 +40,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbc32.lib odbccp32.lib"
+ AdditionalDependencies="odbccp32.lib"
OutputFile=".\./python.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
@@ -102,7 +102,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbc32.lib odbccp32.lib"
+ AdditionalDependencies="odbccp32.lib"
OutputFile="./python_d.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
@@ -172,7 +172,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK /VSEXTCOMP_VERBOSE"
- AdditionalDependencies="odbc32.lib odbccp32.lib"
+ AdditionalDependencies="odbccp32.lib"
OutputFile=".\./python.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
diff --git a/PCbuild/select.vcproj b/PCbuild/select.vcproj
index 188a298..2cab4cc 100644
--- a/PCbuild/select.vcproj
+++ b/PCbuild/select.vcproj
@@ -39,7 +39,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbc32.lib odbccp32.lib wsock32.lib"
+ AdditionalDependencies="wsock32.lib"
OutputFile="./select.pyd"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
@@ -105,7 +105,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbc32.lib odbccp32.lib wsock32.lib"
+ AdditionalDependencies="wsock32.lib"
OutputFile="./select_d.pyd"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
@@ -179,7 +179,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK"
- AdditionalDependencies="odbc32.lib odbccp32.lib wsock32.lib"
+ AdditionalDependencies="wsock32.lib"
OutputFile="./select.pyd"
LinkIncremental="1"
SuppressStartupBanner="TRUE"