For Python 3.5 add the VC14 CRT DLLs

This commit is contained in:
Robin Dunn
2016-05-25 22:23:42 -07:00
parent f03b1157d9
commit 22d2394190
6 changed files with 10 additions and 2 deletions

2
.gitignore vendored
View File

@@ -2,7 +2,6 @@
*.pyc
*.pyd
*.pdb
*.dll
.waf-*
.waf3-*
.lock-waf*
@@ -53,6 +52,7 @@ mydbstub.py*
/wx/*.dylib
/wx/libwx_*
/wx/locale
/wx/*.dll
/unittests/lib_pubsub_provider_actual.py

View File

@@ -1218,7 +1218,7 @@ def copyWxDlls(options):
return
if isWindows:
# Copy the wxWidgets DLLs to the wxPython pacakge folder
# Copy the wxWidgets DLLs to the wxPython package folder
msw = getMSWSettings(options)
cfg = Config()
@@ -1236,6 +1236,14 @@ def copyWxDlls(options):
if options.cairo:
dlls += glob.glob(os.path.join(os.environ['CAIRO_ROOT'], 'bin', '*.dll'))
# For Python 3.5 builds we also need to copy some VC14 redist DLLs
if PYVER == '3.5':
arch = 'x64' if PYTHON_ARCH == '64bit' else 'x86'
redist_dir = os.path.join(
phoenixDir(), 'packaging', 'Py3.5', 'vcredist',
arch, 'Microsoft.VC140.CRT', '*.dll')
dlls += glob.glob(redist_dir)
for dll in dlls:
copyIfNewer(dll, posixjoin(phoenixDir(), cfg.PKGDIR, os.path.basename(dll)), verbose=True)