Merge branch 'msw-dlls-arch-suffix'

Include arch-specific suffix in the DLLs names in makefile.vc too.

See #23053, #23093.

build/bakefiles/common.bkl

@@ -77,7 +77,7 @@
      -->
     <set var="WXCOMPILER">
         <if cond="PLATFORM_WIN32=='1' and OFFICIAL_BUILD=='1'">_$(COMPILERORGCC)$(COMPILER_VERSION)$(ARCH_SUFFIX)</if>
-        <if cond="PLATFORM_WIN32=='1' and OFFICIAL_BUILD=='0'">_$(COMPILERORGCC)</if>
+        <if cond="PLATFORM_WIN32=='1' and OFFICIAL_BUILD=='0'">_$(COMPILERORGCC)$(ARCH_SUFFIX)</if>
     </set>
 
     <set var="VENDORTAG">

build/cmake/functions.cmake

@@ -212,7 +212,9 @@ function(wx_set_target_properties target_name)
     if(wxCOMPILER_PREFIX)
         wx_string_append(dll_suffix "_${wxCOMPILER_PREFIX}")
     endif()
-    if(WIN32_MSVC_NAMING AND wxARCH_SUFFIX)
+    # For compatibility with MSVS project files and makefile.vc, use arch
+    # suffix for non-x86 (including x86_64) DLLs.
+    if(MSVC AND wxARCH_SUFFIX)
         # This one already includes the leading underscore, so don't add another one.
         wx_string_append(dll_suffix "${wxARCH_SUFFIX}")
     endif()

build/msw/makefile.vc

@@ -1883,7 +1883,7 @@ PORTNAME = msw$(TOOLKIT_VERSION)
 COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
 !endif
 !if "$(OFFICIAL_BUILD)" == "0"
-WXCOMPILER = _vc
+WXCOMPILER = _vc$(ARCH_SUFFIX)
 !endif
 !if "$(OFFICIAL_BUILD)" == "1"
 WXCOMPILER = _vc$(COMPILER_VERSION)$(ARCH_SUFFIX)