From 44fea8a4f848b43a25bcc7be880080785922cbed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oleksis=20Fraga=20Men=C3=A9ndez?= Date: Sat, 29 Jan 2022 21:15:10 -0500 Subject: [PATCH] Fix VC dll Dir name add compile version Dont rename vc custom libraries --- build.py | 4 ++-- buildtools/build_wxwidgets.py | 8 -------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/build.py b/build.py index 8324664619..59ebd25964 100755 --- a/build.py +++ b/build.py @@ -390,9 +390,9 @@ class MSWsettings(object): msw = MSWsettings() msw.CPU = os.environ.get('CPU') if msw.CPU in ['AMD64', 'X64'] or PYTHON_ARCH == '64bit': - msw.dllDir = posixjoin(wxDir(), "lib", "vc_x64_dll") + msw.dllDir = posixjoin(wxDir(), "lib", "vc%s_x64_dll" % getVisCVersion()) else: - msw.dllDir = posixjoin(wxDir(), "lib", "vc_dll") + msw.dllDir = posixjoin(wxDir(), "lib", "vc%s_dll" % getVisCVersion()) msw.buildDir = posixjoin(wxDir(), "build", "msw") msw.dll_type = "u" diff --git a/buildtools/build_wxwidgets.py b/buildtools/build_wxwidgets.py index fa060df9b9..0f53c6b8a0 100644 --- a/buildtools/build_wxwidgets.py +++ b/buildtools/build_wxwidgets.py @@ -700,14 +700,6 @@ def main(wxDir, args): exitIfError(ninja_builder.build(dir=buildDir, options=ninja_args), "Error building") print('renaming directory', libdirname, '->', libdirrename) os.rename(libdirname, libdirrename) - for f in os.listdir(libdirrename): - if 'vc_custom' in f: - dst = f.replace('vc_custom', 'vc' + getVisCVersion()) - print('renaming file', f, '->', dst) - - dst = os.path.join(libdirrename, dst) - src = os.path.join(libdirrename, f) - os.rename(src, dst) if options.install: extra=None