]> git.saurik.com Git - wxWidgets.git/blobdiff - build/bakefiles/common.bkl
wxMGL revitalised with OpenWatcom.
[wxWidgets.git] / build / bakefiles / common.bkl
index fb21fce49650cacf6c24b87b0141dfab4fa7b4c9..06b45c3bdb40722854e02c948a0b6367b5c89bd1 100644 (file)
 
     <set var="DIR_SUFFIX_CPU">
         <if cond="FORMAT=='msevc4prj'">_$(CPU)</if>
+        <if cond="TARGET_CPU=='AMD64'">_amd64</if>
+        <if cond="TARGET_CPU=='IA64'">_ia64</if>
     </set>
 
     <if cond="FORMAT!='autoconf'">
         <if cond="MSLU=='1'">unicows</if>
     </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">
         <debug-info>$(DEBUGINFO)</debug-info>
         <debug-runtime-libs>$(DEBUGRUNTIME)</debug-runtime-libs>
         </if>
         <define>$(NO_VC_CRTDBG)</define>
         <define>$(WIN32_WINNT)</define>
-        <if cond="FORMAT=='msevc4prj'">
-            <!-- hack to make eVC4 default project still compatible with eVC3 environment -->
+        <if cond="FORMAT=='msevc4prj' and
+                  BAKEFILE_VERSION in ['0.1.9'] and
+                  USE_RTTI=='0'">
+            <!-- hack to make eVC4 2.6.2 project files compatible with what we had in 2.6.1 -->
             <set var="_ldlibs">$(_ldlibs.replace('ccrtrtti.lib', ''))</set>
+            <set var="_cppflags">$(_cppflags.replace('/GR', ''))</set>
+        </if>
+        <if cond="FORMAT=='msvc'">
+            <ldflags>$(LINK_TARGET_CPU)</ldflags>
+            <res-define>$(RES_TARGET_CPU)</res-define>
         </if>
     </template>