Replace "_amd64" with "_x64" in a few more places.

Fix bakefile presets and MSVC-specific setup.h.

Also document TARGET_CPU=X64 instead of AMD64.

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

diff --git a/build/bakefiles/wxpresets/presets/wx_win32.bkl b/build/bakefiles/wxpresets/presets/wx_win32.bkl
index 6c2a9d0742087c9861e6bbc7b5a01738f2324c58..6aa181c82554a2b299bbe670f60e963a5b30d57a 100644 (file)
--- a/build/bakefiles/wxpresets/presets/wx_win32.bkl
+++ b/build/bakefiles/wxpresets/presets/wx_win32.bkl
@@ -101,7 +101,7 @@
 
     <set var="WXCPU">
         <if cond="FORMAT=='msevc4prj'">_$(CPU)</if>
 
     <set var="WXCPU">
         <if cond="FORMAT=='msevc4prj'">_$(CPU)</if>

-        <if cond="FORMAT_SUPPORTS_MULTIPLE_ARCHITECTURES=='1' and TARGET_CPU=='AMD64'">_amd64</if>
+        <if cond="FORMAT_SUPPORTS_MULTIPLE_ARCHITECTURES=='1' and TARGET_CPU=='AMD64'">_x64</if>

         <if cond="FORMAT_SUPPORTS_MULTIPLE_ARCHITECTURES=='1' and TARGET_CPU=='IA64'">_ia64</if>
     </set>
     
         <if cond="FORMAT_SUPPORTS_MULTIPLE_ARCHITECTURES=='1' and TARGET_CPU=='IA64'">_ia64</if>
     </set>
     

diff --git a/docs/msw/install.txt b/docs/msw/install.txt
index c6293f691c95d28ba92e23171f844583b0a1ddb5..c0cbd4d61ecd43f92fdc69fb8982ca7493614c71 100644 (file)
--- a/docs/msw/install.txt
+++ b/docs/msw/install.txt
@@ -253,7 +253,7 @@ Using makefiles:
 1. Open a 64-bit build command prompt, for either x64 or Itanium. Change
    directory to build\msw. Then for x64 type:
 
 1. Open a 64-bit build command prompt, for either x64 or Itanium. Change
    directory to build\msw. Then for x64 type:
 

-    nmake -f makefile.vc TARGET_CPU=AMD64
+    nmake -f makefile.vc TARGET_CPU=X64

 
    or for Itanium:
 
 
    or for Itanium:
 


@@ -266,7 +266,7 @@ Using makefiles:
 2. Change to the directory of one of the samples such as samples\minimal. Type
    the same command used to build the main library, for example for x64:
 
 2. Change to the directory of one of the samples such as samples\minimal. Type
    the same command used to build the main library, for example for x64:
 

-    nmake -f makefile.vc TARGET_CPU=AMD64
+    nmake -f makefile.vc TARGET_CPU=X64

 
 Notes:
 
 
 Notes:
 


@@ -277,7 +277,7 @@ additional library to be linked or the following error is received.
 
 If you receive this error add bufferoverflowu.lib to link, e.g.:
 
 
 If you receive this error add bufferoverflowu.lib to link, e.g.:
 

-    nmake -f makefile.vc TARGET_CPU=AMD64 LDFLAGS=bufferoverflowu.lib
+    nmake -f makefile.vc TARGET_CPU=X64 LDFLAGS=bufferoverflowu.lib

 
 See http://support.microsoft.com/?id=894573 for more information.
 
 
 See http://support.microsoft.com/?id=894573 for more information.
 


@@ -710,7 +710,7 @@ DEBUG_INFO=1
   omitted or set to 'default' its value is determined the value of
   the BUILD option.
 
   omitted or set to 'default' its value is determined the value of
   the BUILD option.
 

-TARGET_CPU=AMD64|IA64
+TARGET_CPU=X64|IA64

   (VC++ only.) Set this variable to build for x86_64 systems. If unset, x86
   build is performed.
 
   (VC++ only.) Set this variable to build for x86_64 systems. If unset, x86
   build is performed.
 

diff --git a/include/msvc/wx/setup.h b/include/msvc/wx/setup.h
index 06fa7d7ddc9ea6d36b461ab6280ca623db4d3b71..ad4cb5d12bbbc8bf98bd948e649823cefefe70ba 100644 (file)
--- a/include/msvc/wx/setup.h
+++ b/include/msvc/wx/setup.h
@@ -71,7 +71,7 @@
 
 // architecture-specific part: not used (again, for compatibility), for x86
 #if defined(_M_X64)
 
 // architecture-specific part: not used (again, for compatibility), for x86
 #if defined(_M_X64)

-    #define wxARCH_SUFFIX _amd64
+    #define wxARCH_SUFFIX _x64

 #elif defined(_M_IA64)
     #define wxARCH_SUFFIX _ia64
 #else // assume _M_IX86
 #elif defined(_M_IA64)
     #define wxARCH_SUFFIX _ia64
 #else // assume _M_IX86