Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2026-01-04 19:10:09 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Minor tweaks for some comments

Browse Source
This commit is contained in:
Robin Dunn
2018-05-30 16:51:22 -07:00
parent 6453684bc3
commit c53f5b01ca
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
wscript
View File

@@ -68,20 +68,18 @@ def configure(conf):
msvc_version = str( distutils.msvc9compiler.get_build_version() )
# When building for Python 3.7 the msvc_version returned will be
# "14.1" as that is the version of the BasePlatformToolkit that
# stock Python 3.7 was built with, a.k.a v141, which is the
# default in Visual Studio 2017. However, waf is using "msvc
# 15.0" to designate that version rather than "14.1" so we'll
# need to catch that case and fix up the msvc_version
# accordingly.
# "14.1" as that is the version of the BasePlatformToolkit that stock
# Python 3.7 was built with, a.k.a v141, which is the default in
# Visual Studio 2017. However, waf is using "msvc 15.0" to designate
# that version rather than "14.1" so we'll need to catch that case and
# fix up the msvc_version accordingly.
if msvc_version == "14.1" and sys.version_info >= (3,7):
##msvc_version = '15.0'
# On the other hand, microsoft says that v141 and v140
# (Visual Studio 2015) are binary compatible, so for now
# let's just drop it back to "14.0" until I get all the
# details worked out for using VS 2017 everywhere for Python
# 3.7.
# On the other hand, microsoft says that v141 and v140 (Visual
# Studio 2015) are binary compatible, so for now let's just drop
# it back to "14.0" until I get all the details worked out for
# using VS 2017 everywhere for Python 3.7.
msvc_version = '14.0'
conf.env['MSVC_VERSIONS'] = ['msvc ' + msvc_version]