summaryrefslogtreecommitdiffstats
path: root/PCbuild
diff options
context:
space:
mode:
authorZachary Ware <zachary.ware@gmail.com>2016-10-11 03:37:29 (GMT)
committerZachary Ware <zachary.ware@gmail.com>2016-10-11 03:37:29 (GMT)
commit8d794d66bdc2c07c552c31545dd6359bcc258ca6 (patch)
tree7f83942b5eaf533893d748d533048939465330fc /PCbuild
parent0732fd62d9b46950c36468d9dfdca10ba30751a4 (diff)
parent547d156c2c4517ca31f16f6b27cab286ccefcacf (diff)
downloadcpython-8d794d66bdc2c07c552c31545dd6359bcc258ca6.zip
cpython-8d794d66bdc2c07c552c31545dd6359bcc258ca6.tar.gz
cpython-8d794d66bdc2c07c552c31545dd6359bcc258ca6.tar.bz2
Issue #28208: Merge with 3.6
Diffstat (limited to 'PCbuild')
-rw-r--r--PCbuild/get_externals.bat2
-rw-r--r--PCbuild/python.props2
-rw-r--r--PCbuild/readme.txt2
3 files changed, 3 insertions, 3 deletions
diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat
index de85402..a5185be 100644
--- a/PCbuild/get_externals.bat
+++ b/PCbuild/get_externals.bat
@@ -55,7 +55,7 @@ set libraries=
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% 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% tk-8.6.6.0
if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tix-8.4.3.6
diff --git a/PCbuild/python.props b/PCbuild/python.props
index fd7c4ad..dde94f7 100644
--- a/PCbuild/python.props
+++ b/PCbuild/python.props
@@ -42,7 +42,7 @@
<!-- Directories of external projects. tcltk is handled in tcltk.props -->
<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>
<lzmaDir>$(ExternalsDir)xz-5.2.2\</lzmaDir>
<opensslDir>$(ExternalsDir)openssl-1.0.2j\</opensslDir>
diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index c949253..00b50be 100644
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -204,7 +204,7 @@ _ssl
functionality to _ssl or _hashlib. They will not clean up their output
with the normal Clean target; CleanAll should be used instead.
_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:
http://www.sqlite.org/
_tkinter