Commit 2bf60cb0 authored by Steve Dower's avatar Steve Dower

Issue #19450: Update Windows builds to use SQLite 3.8.11.0.

parent 115d8586
...@@ -170,6 +170,8 @@ Tests ...@@ -170,6 +170,8 @@ Tests
Build Build
----- -----
- Issue #19450: Update Windows builds to use SQLite 3.8.11.0.
- Issue #17603: Avoid error about nonexistant fileblocks.o file by using a - Issue #17603: Avoid error about nonexistant fileblocks.o file by using a
lower-level check for st_blocks in struct stat. lower-level check for st_blocks in struct stat.
......
...@@ -59,7 +59,7 @@ set libraries=%libraries% bzip2-1.0.6 ...@@ -59,7 +59,7 @@ set libraries=%libraries% bzip2-1.0.6
if NOT "%IncludeBsddb%"=="false" set libraries=%libraries% db-4.7.25.0 if NOT "%IncludeBsddb%"=="false" set libraries=%libraries% db-4.7.25.0
if NOT "%IncludeSSL%"=="false" set libraries=%libraries% nasm-2.11.06 if NOT "%IncludeSSL%"=="false" set libraries=%libraries% nasm-2.11.06
if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2g if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2g
set libraries=%libraries% sqlite-3.6.21 set libraries=%libraries% sqlite-3.8.11.0
if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-8.5.15.0 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-8.5.15.0
if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.5.15.0 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.5.15.0
if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tix-8.4.3.5 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tix-8.4.3.5
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<!-- Directories of external projects. tcltk is handled in tcltk.props --> <!-- Directories of external projects. tcltk is handled in tcltk.props -->
<ExternalsDir>$([System.IO.Path]::GetFullPath(`$(PySourcePath)externals\`))</ExternalsDir> <ExternalsDir>$([System.IO.Path]::GetFullPath(`$(PySourcePath)externals\`))</ExternalsDir>
<sqlite3Dir>$(ExternalsDir)sqlite-3.6.21\</sqlite3Dir> <sqlite3Dir>$(ExternalsDir)sqlite-3.8.11.0\</sqlite3Dir>
<bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir> <bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir>
<bsddbDir>$(ExternalsDir)db-4.7.25.0</bsddbDir> <bsddbDir>$(ExternalsDir)db-4.7.25.0</bsddbDir>
<opensslDir>$(ExternalsDir)openssl-1.0.2g\</opensslDir> <opensslDir>$(ExternalsDir)openssl-1.0.2g\</opensslDir>
......
...@@ -218,7 +218,7 @@ _ssl ...@@ -218,7 +218,7 @@ _ssl
functionality to _ssl or _hashlib. They will not clean up their output functionality to _ssl or _hashlib. They will not clean up their output
with the normal Clean target; CleanAll should be used instead. with the normal Clean target; CleanAll should be used instead.
_sqlite3 _sqlite3
Wraps SQLite 3.6.21, which is itself built by sqlite3.vcxproj Wraps SQLite 3.8.11.0, which is itself built by sqlite3.vcxproj
Homepage: Homepage:
http://www.sqlite.org/ http://www.sqlite.org/
_tkinter _tkinter
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment