Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Vadim Zeitlin
2012-07-07 15:36:58 +00:00
parent 235a997f9a
commit 97981439aa
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/bakefiles/wxpresets/presets/wx_win32.bkl
View File

@@ -101,7 +101,7 @@
<set var="WXCPU"> <set var="WXCPU">
<if cond="FORMAT=='msevc4prj'">_$(CPU)</if> <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> <if cond="FORMAT_SUPPORTS_MULTIPLE_ARCHITECTURES=='1' and TARGET_CPU=='IA64'">_ia64</if>
</set> </set>

8
docs/msw/install.txt
View File

@@ -253,7 +253,7 @@ Using makefiles:
1. Open a 64-bit build command prompt, for either x64 or Itanium. Change 1. Open a 64-bit build command prompt, for either x64 or Itanium. Change
directory to build\msw. Then for x64 type: 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 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: 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 omitted or set to 'default' its value is determined the value of
the BUILD option. 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 (VC++ only.) Set this variable to build for x86_64 systems. If unset, x86
build is performed. build is performed.

2
include/msvc/wx/setup.h
View File

@@ -71,7 +71,7 @@
// architecture-specific part: not used (again, for compatibility), for x86 // architecture-specific part: not used (again, for compatibility), for x86
#if defined(_M_X64) #if defined(_M_X64)
#define wxARCH_SUFFIX _amd64 #define wxARCH_SUFFIX _x64
#elif defined(_M_IA64) #elif defined(_M_IA64)
#define wxARCH_SUFFIX _ia64 #define wxARCH_SUFFIX _ia64
#else // assume _M_IX86 #else // assume _M_IX86