mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Adjust sqlite3 build process to Win64.

Browse source
This commit is contained in:
Martin v. Löwis 2006-04-04 16:28:14 +00:00
parent 8ddab27182
commit e510bd16ea
2 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
PCbuild/_sqlite3.vcproj
View file

@ -152,7 +152,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK" AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK"
AdditionalDependencies="..\..\sqlite-source-3.3.4\sqlite3.lib" AdditionalDependencies="..\..\sqlite-source-3.3.4\ia64\sqlite3.lib"
OutputFile="./_sqlite3.pyd" OutputFile="./_sqlite3.pyd"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
@ -214,7 +214,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK" AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK"
AdditionalDependencies="..\..\sqlite-source-3.3.4\sqlite3.lib" AdditionalDependencies="..\..\sqlite-source-3.3.4\amd64\sqlite3.lib"
OutputFile="./_sqlite3.pyd" OutputFile="./_sqlite3.pyd"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"

8
Tools/msi/msi.py
View file

@ -967,7 +967,13 @@ def add_files(db):
for f in glob.glob1(tcldir, "*.dll"): for f in glob.glob1(tcldir, "*.dll"):
lib.add_file(f, src=os.path.join(tcldir, f)) lib.add_file(f, src=os.path.join(tcldir, f))
# Add sqlite # Add sqlite
lib.add_file(srcdir+"/"+sqlite_dir+"/sqlite3.dll") if msilib.msi_type=="Intel64;1033":
sqlite_arch = "/ia64"
elif msilib.msi_type=="x64;1033":
sqlite_arch = "/amd64"
else:
sqlite_arch = ""
lib.add_file(srcdir+"/"+sqlite_dir+sqlite_arch+"/sqlite3.dll")
# check whether there are any unknown extensions # check whether there are any unknown extensions
for f in glob.glob1(srcdir+"/PCBuild", "*.pyd"): for f in glob.glob1(srcdir+"/PCBuild", "*.pyd"):
if f.endswith("_d.pyd"): continue # debug version if f.endswith("_d.pyd"): continue # debug version