diff --git a/.gitignore b/.gitignore index ff53a6fa..07faf391 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/build.py b/build.py index 0ea1fc25..b6bf6222 100755 --- a/build.py +++ b/build.py @@ -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) diff --git a/ext/wxWidgets b/ext/wxWidgets index a36e071c..acf70689 160000 --- a/ext/wxWidgets +++ b/ext/wxWidgets @@ -1 +1 @@ -Subproject commit a36e071cd4d63d8d7d03a1d300b619f1db61a409 +Subproject commit acf7068995283aa9e63b59fe9dcb65454893fee7 diff --git a/packaging/Py3.5/vcredist/x64/Microsoft.VC140.CRT/msvcp140.dll b/packaging/Py3.5/vcredist/x64/Microsoft.VC140.CRT/msvcp140.dll new file mode 100644 index 00000000..8c808632 Binary files /dev/null and b/packaging/Py3.5/vcredist/x64/Microsoft.VC140.CRT/msvcp140.dll differ diff --git a/packaging/Py3.5/vcredist/x64/Microsoft.VC140.CRT/vcruntime140.dll b/packaging/Py3.5/vcredist/x64/Microsoft.VC140.CRT/vcruntime140.dll new file mode 100644 index 00000000..b2f84193 Binary files /dev/null and b/packaging/Py3.5/vcredist/x64/Microsoft.VC140.CRT/vcruntime140.dll differ diff --git a/packaging/Py3.5/vcredist/x86/Microsoft.VC140.CRT/msvcp140.dll b/packaging/Py3.5/vcredist/x86/Microsoft.VC140.CRT/msvcp140.dll new file mode 100644 index 00000000..6460fd6c Binary files /dev/null and b/packaging/Py3.5/vcredist/x86/Microsoft.VC140.CRT/msvcp140.dll differ diff --git a/packaging/Py3.5/vcredist/x86/Microsoft.VC140.CRT/vcruntime140.dll b/packaging/Py3.5/vcredist/x86/Microsoft.VC140.CRT/vcruntime140.dll new file mode 100644 index 00000000..f65959c5 Binary files /dev/null and b/packaging/Py3.5/vcredist/x86/Microsoft.VC140.CRT/vcruntime140.dll differ