From: Michael Wetherell <mike.wetherell@ntlworld.com> Date: Wed, 30 Nov 2005 20:13:48 +0000 (+0000) Subject: Let TARGET_CPU work with either upper or lower case X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/b974b0da43ce48f000fff1a52964d0690a6cf115 Let TARGET_CPU work with either upper or lower case git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36317 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl index fe8b232036..d1f73b67fa 100644 --- a/build/bakefiles/common.bkl +++ b/build/bakefiles/common.bkl @@ -161,7 +161,9 @@ <set var="DIR_SUFFIX_CPU"> <if cond="FORMAT=='msevc4prj'">_$(CPU)</if> + <if cond="TARGET_CPU=='amd64'">_amd64</if> <if cond="TARGET_CPU=='AMD64'">_amd64</if> + <if cond="TARGET_CPU=='ia64'">_ia64</if> <if cond="TARGET_CPU=='IA64'">_ia64</if> </set> @@ -275,7 +277,9 @@ </set> <set var="LINK_TARGET_CPU"> + <if cond="TARGET_CPU=='amd64'">/MACHINE:AMD64</if> <if cond="TARGET_CPU=='AMD64'">/MACHINE:AMD64</if> + <if cond="TARGET_CPU=='ia64'">/MACHINE:IA64</if> <if cond="TARGET_CPU=='IA64'">/MACHINE:IA64</if> </set> diff --git a/docs/msw/install.txt b/docs/msw/install.txt index ef522bb16a..04f95cd29d 100644 --- a/docs/msw/install.txt +++ b/docs/msw/install.txt @@ -215,7 +215,7 @@ Using project files: corresponding 32-bit target for some files. Therefore after building for one CPU it is necessary to clean the build before building the equivalent target for another CPU. We've reported the problem to MS - so maybe this will be fixed before VS 2005 ships. + but they say it is not possible to fix it. 3. To build, go to the 'Build' menu and choose 'Batch Build...'. Tick all the all the 'x64|Debug' or all the 'Itanium|Debug' projects, and click 'Build'. @@ -231,7 +231,7 @@ Using project files: Using makefiles: 1. Open a 64-bit build command prompt, for either x64 or Itanium. Change - directory to build\msw. Then for x64 type (note upper case): + directory to build\msw. Then for x64 type: nmake -f makefile.vc TARGET_CPU=AMD64