added USE_RTTI (instead of it being set by USE_EXCEPTIONS)

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

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 00d8928ba96a35a368566288c6b074774ed82423..21b81b57e8c4bf5f797e7aaf929c1de09bf644fa 100644 (file)
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -247,6 +247,10 @@
         <if cond="USE_EXCEPTIONS=='1'">on</if>
         <if cond="USE_EXCEPTIONS=='0'">off</if>
     </set>
+    <set var="RTTIFLAG">
+        <if cond="USE_RTTI=='1'">on</if>
+        <if cond="USE_RTTI=='0'">off</if>
+    </set>
     <set var="THREADSFLAG">
         <if cond="USE_THREADS=='1'">multi</if>
         <if cond="USE_THREADS=='0'">single</if>
@@ -280,7 +284,7 @@
         <optimize>$(OPTIMIZEFLAG)</optimize>
         <threading>$(THREADSFLAG)</threading>
         <runtime-libs>$(RUNTIME_LIBS)</runtime-libs>
-        <cxx-rtti>$(EXCEPTIONSFLAG)</cxx-rtti>
+        <cxx-rtti>$(RTTIFLAG)</cxx-rtti>
         <cxx-exceptions>$(EXCEPTIONSFLAG)</cxx-exceptions>
         <if cond="FORMAT!='autoconf'">
             <cppflags>$(EXTRACFLAGS)</cppflags>

diff --git a/build/bakefiles/config.bkl b/build/bakefiles/config.bkl
index dd448177982b05b71d19faaf865d7837379b4a68..94f9eae37a080c94d12297eb4b28886000f3c4a6 100644 (file)
--- a/build/bakefiles/config.bkl
+++ b/build/bakefiles/config.bkl
@@ -163,6 +163,14 @@ Acts according to DEBUG_INFO by default.
         </description>
     </option>
     
+    <option name="USE_RTTI">
+        <values>0,1</values>
+        <default-value>1</default-value>
+        <description>
+            Enable run-time type information (RTTI) in compiled code.
+        </description>
+    </option>
+    
     <option name="USE_THREADS">
         <values>0,1</values>
         <default-value>1</default-value>
@@ -337,6 +345,7 @@ Set the version of your Mingw installation here.
         <set var="MONOLITHIC">0</set>
         <set var="USE_GUI">1</set>
         <set var="USE_EXCEPTIONS">1</set>
+        <set var="USE_RTTI">1</set>
         <set var="USE_THREADS">1</set>
         <set var="DEBUG_INFO">default</set>
         <set var="DEBUG_FLAG">default</set>