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

Add CPU_TARGET option to msvc makefiles for targeting AMD64 and IA64

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35908 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell
2005-10-16 20:25:10 +00:00
parent d6701f32aa
commit e40b74ba83
2 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
build/bakefiles/common.bkl
View File

@@ -161,6 +161,8 @@
<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=='IA64'">_ia64</if>
</set> </set>
<if cond="FORMAT!='autoconf'"> <if cond="FORMAT!='autoconf'">
@@ -272,6 +274,15 @@
<if cond="MSLU=='1'">unicows</if> <if cond="MSLU=='1'">unicows</if>
</set> </set>
<set var="LINK_TARGET_CPU">
<if cond="TARGET_CPU=='AMD64'">/MACHINE:AMD64</if>
<if cond="TARGET_CPU=='IA64'">/MACHINE:IA64</if>
</set>
<set var="RES_TARGET_CPU">
<if cond="TARGET_CPU=='AMD64'">WX_CPU_AMD64</if>
<if cond="TARGET_CPU=='IA64'">WX_CPU_IA64</if>
</set>
<template id="common_settings"> <template id="common_settings">
<debug-info>$(DEBUGINFO)</debug-info> <debug-info>$(DEBUGINFO)</debug-info>
<debug-runtime-libs>$(DEBUGRUNTIME)</debug-runtime-libs> <debug-runtime-libs>$(DEBUGRUNTIME)</debug-runtime-libs>
@@ -292,6 +303,10 @@
<set var="_ldlibs">$(_ldlibs.replace('ccrtrtti.lib', ''))</set> <set var="_ldlibs">$(_ldlibs.replace('ccrtrtti.lib', ''))</set>
<set var="_cppflags">$(_cppflags.replace('/GR', ''))</set> <set var="_cppflags">$(_cppflags.replace('/GR', ''))</set>
</if> </if>
<if cond="FORMAT=='msvc'">
<ldflags>$(LINK_TARGET_CPU)</ldflags>
<res-define>$(RES_TARGET_CPU)</res-define>
</if>
</template> </template>
<template id="anylib"> <template id="anylib">

17
build/bakefiles/config.bkl
View File

@@ -54,6 +54,23 @@
</description> </description>
</option> </option>
<if cond="FORMAT=='msvc'">
<option name="TARGET_CPU">
<values>AMD64,IA64</values>
<default-value>$(DOLLAR)(CPU)</default-value>
<description>
The target processor architecture must be specified when it is not X86.
This does not affect the compiler output, so you still need to make sure
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.
</description>
</option>
</if>
<if cond="FORMAT!='msvc'">
<set var="TARGET_CPU"/>
</if>
<!-- FIXME: restore this once bakefile is fixed to not use <!-- FIXME: restore this once bakefile is fixed to not use
/Gm /GZ (incompatible with /O2) w/ debug-info --> /Gm /GZ (incompatible with /O2) w/ debug-info -->
<set var="DEBUG_INFO_DEFAULT"> <set var="DEBUG_INFO_DEFAULT">