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)

docs/changes.txt

@@ -82,6 +82,10 @@ Changes in behaviour which may result in build errors
 - wxOnAssert() overload taking wide character file name was removed. If you
   call it for any reason, please use one of the other overloads instead.
 
+- 64-bit DLLs now use "x64" suffix in their names for all builds, not just
+  the official ones and those using MSVS projects, but also when using
+  makefile.vc or CMake, for consistency.
+
 
 3.3.0: (released 2022-??-??)
 ----------------------------

docs/contributing/about-platform-toolkit-and-library-names.md

@@ -105,7 +105,7 @@ It is only added to shared libraries on Windows.
 
 --------------------------------------------------------------------
 
-`$arch` is used only by MSVS solutions. It is empty for 32-bit builds and
+`$arch` is used only when building with MSVC. It is empty for 32-bit builds and
 `'x64'` for 64-bit builds. It is only added to shared libraries.
 
 --------------------------------------------------------------------

samples/render/makefile.vc

@@ -88,7 +88,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)