From: Włodzimierz Skiba <abx@abx.art.pl>
Date: Mon, 22 Aug 2005 14:54:41 +0000 (+0000)
Subject: Compensation for bkl 0.1.9.X/eVC4/RTTI bug.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/790fc140a9a124e8e7e97d2558681c9c2a4a582b

Compensation for bkl 0.1.9.X/eVC4/RTTI bug.


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

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index fb21fce496..ac23bd5ecf 100644
--- 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 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>
     </template>