Commit 547d156c authored by Zachary Ware's avatar Zachary Ware

Issue #28208: Update Windows build to use SQLite 3.14.2.0

parent c08bb6c6
...@@ -16,6 +16,8 @@ Library ...@@ -16,6 +16,8 @@ Library
Build Build
----- -----
- Issue #28208: Update Windows build to use SQLite 3.14.2.0.
- Issue #28248: Update Windows build to use OpenSSL 1.0.2j. - Issue #28248: Update Windows build to use OpenSSL 1.0.2j.
......
...@@ -55,7 +55,7 @@ set libraries= ...@@ -55,7 +55,7 @@ set libraries=
set libraries=%libraries% bzip2-1.0.6 set libraries=%libraries% bzip2-1.0.6
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.2j if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2j
set libraries=%libraries% sqlite-3.14.1.0 set libraries=%libraries% sqlite-3.14.2.0
if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-core-8.6.6.0 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-core-8.6.6.0
if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.6.6.0 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.6.6.0
if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tix-8.4.3.6 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tix-8.4.3.6
......
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,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.14.1.0\</sqlite3Dir> <sqlite3Dir>$(ExternalsDir)sqlite-3.14.2.0\</sqlite3Dir>
<bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir> <bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir>
<lzmaDir>$(ExternalsDir)xz-5.2.2\</lzmaDir> <lzmaDir>$(ExternalsDir)xz-5.2.2\</lzmaDir>
<opensslDir>$(ExternalsDir)openssl-1.0.2j\</opensslDir> <opensslDir>$(ExternalsDir)openssl-1.0.2j\</opensslDir>
......
...@@ -204,7 +204,7 @@ _ssl ...@@ -204,7 +204,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.14.1.0, which is itself built by sqlite3.vcxproj Wraps SQLite 3.14.2.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