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

Let TARGET_CPU work with either upper or lower case

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36317 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell
2005-11-30 20:13:48 +00:00
parent 80050aa167
commit b974b0da43
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build/bakefiles/common.bkl
View File

@@ -161,7 +161,9 @@
<set var="DIR_SUFFIX_CPU"> <set var="DIR_SUFFIX_CPU">
<if cond="FORMAT=='msevc4prj'">_$(CPU)</if> <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'">_amd64</if>
<if cond="TARGET_CPU=='ia64'">_ia64</if>
<if cond="TARGET_CPU=='IA64'">_ia64</if> <if cond="TARGET_CPU=='IA64'">_ia64</if>
</set> </set>
@@ -275,7 +277,9 @@
</set> </set>
<set var="LINK_TARGET_CPU"> <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=='AMD64'">/MACHINE:AMD64</if>
<if cond="TARGET_CPU=='ia64'">/MACHINE:IA64</if>
<if cond="TARGET_CPU=='IA64'">/MACHINE:IA64</if> <if cond="TARGET_CPU=='IA64'">/MACHINE:IA64</if>
</set> </set>

4
docs/msw/install.txt
View File

@@ -215,7 +215,7 @@ Using project files:
corresponding 32-bit target for some files. Therefore after building corresponding 32-bit target for some files. Therefore after building
for one CPU it is necessary to clean the build before building the 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 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 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'. all the 'x64|Debug' or all the 'Itanium|Debug' projects, and click 'Build'.
@@ -231,7 +231,7 @@ Using project files:
Using makefiles: 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 (note upper case): directory to build\msw. Then for x64 type:
nmake -f makefile.vc TARGET_CPU=AMD64 nmake -f makefile.vc TARGET_CPU=AMD64