From: Francesco Montorsi <f18m_cpp217828@yahoo.it>
Date: Fri, 5 Mar 2010 20:51:42 +0000 (+0000)
Subject: define TARGET_CPU (as a variable) also for formats using MSVS_PLATFORM; this allows... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/694b7ca407682e12774640ff444ac557dc7045f5

define TARGET_CPU (as a variable) also for formats using MSVS_PLATFORM; this allows a simpler logic in the following tests (and in the user bakefiles)

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

diff --git a/build/bakefiles/wxpresets/presets/wx_win32.bkl b/build/bakefiles/wxpresets/presets/wx_win32.bkl
index 0c015e75cf..4b86018bee 100644
--- a/build/bakefiles/wxpresets/presets/wx_win32.bkl
+++ b/build/bakefiles/wxpresets/presets/wx_win32.bkl
@@ -52,6 +52,25 @@
             </description>
         </option>
     </if>
+    <if cond="not isdefined('TARGET_CPU') and FORMAT_SUPPORTS_MULTIPLE_ARCHITECTURES_VIA_MSVS_PLATFORMS=='1'">
+        <!-- defining TARGET_CPU also for the formats using the MSVS_PLATFORM variable allows to write
+             easier tests in user bakefiles; e.g.:
+             
+            <set var="MY_ARCH_DEPENDENT_VARIABLE">
+                <if cond="FORMAT_SUPPORTS_MULTIPLE_ARCHITECTURES=='0'">value1</if>
+                <if cond="FORMAT_SUPPORTS_MULTIPLE_ARCHITECTURES=='1' and TARGET_CPU=='X86'">value2</if>
+                <if cond="FORMAT_SUPPORTS_MULTIPLE_ARCHITECTURES=='1' and TARGET_CPU=='AMD64'">value3</if>
+                <if cond="FORMAT_SUPPORTS_MULTIPLE_ARCHITECTURES=='1' and TARGET_CPU=='IA64'">value4</if>
+            </set>
+        -->
+        <set var="TARGET_CPU">
+            <if cond="MSVS_PLATFORM=='win32'">X86</if>
+            <if cond="MSVS_PLATFORM=='win64'">AMD64</if>
+            <if cond="MSVS_PLATFORM=='ia64'">IA64</if>
+                <!-- MSVS_PLATFORM currently does not support ia64 but this line is still needed by bakefile 
+                     to correctly set the TARGET_CPU variable -->
+        </set>
+    </if>
 
 
 
@@ -82,17 +101,13 @@
 
     <set var="WXCPU">
         <if cond="FORMAT=='msevc4prj'">_$(CPU)</if>
-        
-        <!-- just define the correct string for those formats which support the 'TARGET_CPU' option: -->
-        <if cond="FORMAT_SUPPORTS_MULTIPLE_ARCHITECTURES_NORMAL=='1' and TARGET_CPU=='AMD64'">_amd64</if>
-        <if cond="FORMAT_SUPPORTS_MULTIPLE_ARCHITECTURES_NORMAL=='1' and TARGET_CPU=='IA64'">_ia64</if>
-        
-        <!-- for MSVS projects instead of the 'TARGET_CPU' option we need to use the 'MSVS_PLATFORM' variable: -->
-        <if cond="FORMAT_SUPPORTS_MULTIPLE_ARCHITECTURES_VIA_MSVS_PLATFORMS=='1' and MSVS_PLATFORM=='win64'">_amd64</if>
+        <if cond="FORMAT_SUPPORTS_MULTIPLE_ARCHITECTURES=='1' and TARGET_CPU=='AMD64'">_amd64</if>
+        <if cond="FORMAT_SUPPORTS_MULTIPLE_ARCHITECTURES=='1' and TARGET_CPU=='IA64'">_ia64</if>
     </set>
     
     <set var="WXMACHINE_FLAG">
-        <!-- add the /MACHINE linker flag to formats with "normal" multiple-arch support when building in 64bit mode: -->
+        <!-- add the /MACHINE linker flag to formats with "normal" multiple-arch support when building in 64bit mode
+             (formats using the MSVS_PLATFORM variable don't need the /MACHINE linker flag!): -->
         <if cond="FORMAT_SUPPORTS_MULTIPLE_ARCHITECTURES_NORMAL=='1' and TARGET_CPU=='AMD64'">/MACHINE:AMD64</if>
         <if cond="FORMAT_SUPPORTS_MULTIPLE_ARCHITECTURES_NORMAL=='1' and TARGET_CPU=='IA64'">/MACHINE:IA64</if>
     </set>