diff options
| -rw-r--r-- | PCbuild/_sqlite3.vcproj | 4 | ||||
| -rw-r--r-- | Tools/msi/msi.py | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/PCbuild/_sqlite3.vcproj b/PCbuild/_sqlite3.vcproj index f1d293a..a24c5e6 100644 --- a/PCbuild/_sqlite3.vcproj +++ b/PCbuild/_sqlite3.vcproj @@ -152,7 +152,7 @@ <Tool Name="VCLinkerTool" 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" LinkIncremental="1" SuppressStartupBanner="TRUE" @@ -214,7 +214,7 @@ <Tool Name="VCLinkerTool" 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" LinkIncremental="1" SuppressStartupBanner="TRUE" diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py index 0b8fbc3..ab2a6d2 100644 --- a/Tools/msi/msi.py +++ b/Tools/msi/msi.py @@ -967,7 +967,13 @@ def add_files(db): for f in glob.glob1(tcldir, "*.dll"): lib.add_file(f, src=os.path.join(tcldir, f)) # 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 for f in glob.glob1(srcdir+"/PCBuild", "*.pyd"): if f.endswith("_d.pyd"): continue # debug version |