support for fractional characters widths under Mac

[wxWidgets.git] / build / bakefiles / common.bkl

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index fb21fce49650cacf6c24b87b0141dfab4fa7b4c9..ac23bd5ecff0370b8e504a8fe59cb4352cf9c76a 100644 (file)
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -285,9 +285,12 @@
         </if>
         <define>$(NO_VC_CRTDBG)</define>
         <define>$(WIN32_WINNT)</define>
         </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="_ldlibs">$(_ldlibs.replace('ccrtrtti.lib', ''))</set>

+            <set var="_cppflags">$(_cppflags.replace('/GR', ''))</set>

         </if>
     </template>
 
         </if>
     </template>