configurable use of exceptions

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

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 9f55b3213a52707f5dc83aba2353bda3b6fad843..bd4ac24a2195e35c78c188ae14e6c7bcad301acd 100644 (file)
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -198,6 +198,10 @@
         <if cond="BUILD=='debug'">off</if>
         <if cond="BUILD=='release'">speed</if>
     </set>
+    <set var="EXCEPTIONSFLAG">
+        <if cond="USE_EXCEPTIONS=='1'">on</if>
+        <if cond="USE_EXCEPTIONS=='0'">off</if>
+    </set>
 
     <set var="DEBUG_DEFINE">
         <if cond="FORMAT!='autoconf' and BUILD=='debug' and DEBUG_FLAG=='default'">__WXDEBUG__</if>
@@ -222,6 +226,8 @@
         <optimize>$(OPTIMIZEFLAG)</optimize>
         <threading>multi</threading>
         <runtime-libs>$(RUNTIME_LIBS)</runtime-libs>
+        <cxx-rtti>$(EXCEPTIONSFLAG)</cxx-rtti>
+        <cxx-exceptions>$(EXCEPTIONSFLAG)</cxx-exceptions>
         <if cond="FORMAT!='autoconf'">
             <cppflags>$(EXTRACFLAGS)</cppflags>
         </if>

diff --git a/build/bakefiles/config.bkl b/build/bakefiles/config.bkl
index 94c9d82556e4758b3c38c8bd197f2e8d9fadf6b7..f6fe38d2dec6cfb6300cd793959617aadaed1c23 100644 (file)
--- a/build/bakefiles/config.bkl
+++ b/build/bakefiles/config.bkl
@@ -129,6 +129,14 @@ Acts according to DEBUG_INFO by default.
         </description>
     </option>
     
+    <option name="USE_EXCEPTIONS">
+        <values>0,1</values>
+        <default-value>1</default-value>
+        <description>
+            Enable exceptions in compiled code.
+        </description>
+    </option>
+    
     <option name="OFFICIAL_BUILD">
         <values>0,1</values>
         <default-value>0</default-value>
@@ -247,6 +255,7 @@ Set the version of your Mingw installation here.
         <set var="USE_ODBC">1</set>
         <set var="MONOLITHIC">0</set>
         <set var="USE_GUI">1</set>
+        <set var="USE_EXCEPTIONS">1</set>
         <set var="DEBUG_INFO">default</set>
         <set var="DEBUG_FLAG">default</set>
         <set var="MSLU">0</set>