Use "_x64" instead of "amd64" for x64 MSW makefile builds.

Still accept "amd64" as a valid TARGET_CPU value but also accept, and
encourage people to use, "x64".

Add a new section about the build system changes to the change log and added a
mini-TOC to it to make navigating it a bit easier and show what changes are
there at a glance.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71978 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 4747f48f1ad2b61d8820e0474e16bff3c8531864..db792b410bc40b224a2bdd2618d99a0461ca0d85 100644 (file)
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -32,10 +32,12 @@
 
     <set var="ARCH_SUFFIX">
         <if cond="FORMAT=='msevc4prj'">_$(CPU)</if>
 
     <set var="ARCH_SUFFIX">
         <if cond="FORMAT=='msevc4prj'">_$(CPU)</if>

-        <if cond="TARGET_CPU=='amd64'">_amd64</if>
-        <if cond="TARGET_CPU=='AMD64'">_amd64</if>
+        <if cond="TARGET_CPU=='amd64'">_x64</if>
+        <if cond="TARGET_CPU=='AMD64'">_x64</if>

         <if cond="TARGET_CPU=='ia64'">_ia64</if>
         <if cond="TARGET_CPU=='IA64'">_ia64</if>
         <if cond="TARGET_CPU=='ia64'">_ia64</if>
         <if cond="TARGET_CPU=='IA64'">_ia64</if>

+        <if cond="TARGET_CPU=='x64'">_x64</if>
+        <if cond="TARGET_CPU=='X64'">_x64</if>

     </set>
 
     <!-- ================================================================== -->
     </set>
 
     <!-- ================================================================== -->


@@ -318,6 +320,8 @@
         <if cond="TARGET_CPU=='AMD64'">/MACHINE:X64</if>
         <if cond="TARGET_CPU=='ia64'">/MACHINE:IA64</if>
         <if cond="TARGET_CPU=='IA64'">/MACHINE:IA64</if>
         <if cond="TARGET_CPU=='AMD64'">/MACHINE:X64</if>
         <if cond="TARGET_CPU=='ia64'">/MACHINE:IA64</if>
         <if cond="TARGET_CPU=='IA64'">/MACHINE:IA64</if>

+        <if cond="TARGET_CPU=='x64'">/MACHINE:X64</if>
+        <if cond="TARGET_CPU=='X64'">/MACHINE:X64</if>

     </set>
 
     <template id="common_settings">
     </set>
 
     <template id="common_settings">

diff --git a/build/bakefiles/config.bkl b/build/bakefiles/config.bkl
index 19fee628994f2f73a17a6dbb9622a48456742b96..2f0327eedb171de66c25a16c737630a823ce3978 100644 (file)
--- a/build/bakefiles/config.bkl
+++ b/build/bakefiles/config.bkl
@@ -103,7 +103,8 @@ your environment is set up appropriately with the correct compiler in the
 PATH. Rather it affects some options passed to some of the common build
 utilities such as the resource compiler and the linker.
 
 PATH. Rather it affects some options passed to some of the common build
 utilities such as the resource compiler and the linker.
 

-Accepted values: AMD64, IA64.
+Accepted values: IA64, X64
+(AMD64 accepted as synonym for X64 but should not be used any more).

             </description>
         </option>
     </if>
             </description>
         </option>
     </if>

diff --git a/build/msw/config.vc b/build/msw/config.vc
index b9cc99126096d73c0e5f7998931e72042e9d41da..d01e853bdb50aa280f6fde1f5783bae4746bd34a 100644 (file)
--- a/build/msw/config.vc
+++ b/build/msw/config.vc
@@ -52,7 +52,8 @@ BUILD = debug
 # PATH. Rather it affects some options passed to some of the common build\r
 # utilities such as the resource compiler and the linker.\r
 # \r
 # PATH. Rather it affects some options passed to some of the common build\r
 # utilities such as the resource compiler and the linker.\r
 # \r

-# Accepted values: AMD64, IA64. \r
+# Accepted values: IA64, X64
+# (AMD64 accepted as synonym for X64 but should not be used any more).

 TARGET_CPU = $(CPU)\r
 \r
 # Should debugging info be included in the executables? The default value\r
 TARGET_CPU = $(CPU)\r
 \r
 # Should debugging info be included in the executables? The default value\r

diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index fe793f6685c4ad6a0d9a247db803ded1f268e4f2..2dd0e2680202943383172b026e72dc9b2e0e6a1c 100644 (file)
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -1723,17 +1723,23 @@ BUILD_CFG_FILE = $(SETUPHDIR)\build.cfg
 ### Conditionally set variables: ###\r
 \r
 !if "$(TARGET_CPU)" == "AMD64"\r
 ### Conditionally set variables: ###\r
 \r
 !if "$(TARGET_CPU)" == "AMD64"\r

-ARCH_SUFFIX = _amd64\r
+ARCH_SUFFIX = _x64

 !endif\r
 !if "$(TARGET_CPU)" == "IA64"\r
 ARCH_SUFFIX = _ia64\r
 !endif\r
 !endif\r
 !if "$(TARGET_CPU)" == "IA64"\r
 ARCH_SUFFIX = _ia64\r
 !endif\r

+!if "$(TARGET_CPU)" == "X64"
+ARCH_SUFFIX = _x64
+!endif

 !if "$(TARGET_CPU)" == "amd64"\r
 !if "$(TARGET_CPU)" == "amd64"\r

-ARCH_SUFFIX = _amd64\r
+ARCH_SUFFIX = _x64

 !endif\r
 !if "$(TARGET_CPU)" == "ia64"\r
 ARCH_SUFFIX = _ia64\r
 !endif\r
 !endif\r
 !if "$(TARGET_CPU)" == "ia64"\r
 ARCH_SUFFIX = _ia64\r
 !endif\r

+!if "$(TARGET_CPU)" == "x64"
+ARCH_SUFFIX = _x64
+!endif

 !if "$(USE_GUI)" == "0"\r
 PORTNAME = base\r
 !endif\r
 !if "$(USE_GUI)" == "0"\r
 PORTNAME = base\r
 !endif\r


@@ -1782,12 +1788,18 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "IA64"\r
 LINK_TARGET_CPU = /MACHINE:IA64\r
 !endif\r
 !if "$(TARGET_CPU)" == "IA64"\r
 LINK_TARGET_CPU = /MACHINE:IA64\r
 !endif\r

+!if "$(TARGET_CPU)" == "X64"
+LINK_TARGET_CPU = /MACHINE:X64
+!endif

 !if "$(TARGET_CPU)" == "amd64"\r
 LINK_TARGET_CPU = /MACHINE:X64\r
 !endif\r
 !if "$(TARGET_CPU)" == "ia64"\r
 LINK_TARGET_CPU = /MACHINE:IA64\r
 !endif\r
 !if "$(TARGET_CPU)" == "amd64"\r
 LINK_TARGET_CPU = /MACHINE:X64\r
 !endif\r
 !if "$(TARGET_CPU)" == "ia64"\r
 LINK_TARGET_CPU = /MACHINE:IA64\r
 !endif\r

+!if "$(TARGET_CPU)" == "x64"
+LINK_TARGET_CPU = /MACHINE:X64
+!endif

 !if "$(RUNTIME_LIBS)" == "dynamic"\r
 __RUNTIME_LIBS_10 = D\r
 !endif\r
 !if "$(RUNTIME_LIBS)" == "dynamic"\r
 __RUNTIME_LIBS_10 = D\r
 !endif\r

diff --git a/docs/changes.txt b/docs/changes.txt
index f8534e00e26c0339dd43ab1796b7f0bd4bd68084..eb56788041113dd2ab4f4cfaef396d90b28b0521 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -10,6 +10,14 @@ INCOMPATIBLE CHANGES SINCE 2.8.x
         the "Changes Since wxWidgets 2.8" section of the manual,
         please read it if the explanation here is too cryptic.
 
         the "Changes Since wxWidgets 2.8" section of the manual,
         please read it if the explanation here is too cryptic.
 

+Table of contents of this section:
+
+ - Unicode-related changes
+ - wxODBC and contrib libraries removal
+ - Changes in behaviour not resulting in compilation errors
+ - Build system changes
+ - Major new features in this release
+

 
 Unicode-related changes
 -----------------------
 
 Unicode-related changes
 -----------------------


@@ -470,6 +478,20 @@ Changes in behaviour visible to end users
   now the control scrolls if too much text is added.
 
 
   now the control scrolls if too much text is added.
 
 

+Build system changes
+--------------------
+
+- In wxMSW makefile builds, "_x64" is used instead of "_amd64" when compiling
+  for this architecture in the architecture-specific paths and library names.
+  TARGET_CPU can still be specified as "amd64" for compatibility but "x64"
+  should be used now.
+
+- Official wxMSW binaries, i.e. those built with OFFICIAL_BUILD=1, built with
+  MSVC now include the version of the compiler used and the architecture if
+  it's not the default "x86". E.g. a library built with MSVC 10 for amd64 is
+  called "wxbase294ud_vc110_amd64.dll" now.
+
+

 Major new features in this release
 ----------------------------------
 
 Major new features in this release
 ----------------------------------