Fix VC dll Dir name add compile version

Dont rename vc custom libraries
oleksis · Jan 30, 2022 · 44fea8a · 44fea8a
1 parent d309f52
commit 44fea8a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git 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
@@ -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