added USE_THREADS

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

diff --git a/build/bakefiles/build_cfg.bkl b/build/bakefiles/build_cfg.bkl
index babe823e1dfbf3485c0d66763d107a3b0d7aaeae..039134ed229fbc9e0260cd09af415d4118974ce5 100644 (file)
--- a/build/bakefiles/build_cfg.bkl
+++ b/build/bakefiles/build_cfg.bkl
@@ -35,6 +35,7 @@
                 @echo RUNTIME_LIBS=$(RUNTIME_LIBS) >>$(BUILD_CFG_FILE)
                 @echo MSLU=$(MSLU) >>$(BUILD_CFG_FILE)
                 @echo USE_EXCEPTIONS=$(USE_EXCEPTIONS) >>$(BUILD_CFG_FILE)
+                @echo USE_THREADS=$(USE_THREADS) >>$(BUILD_CFG_FILE)
                 @echo USE_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE)
                 @echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE)
                 @echo USE_ODBC=$(USE_ODBC) >>$(BUILD_CFG_FILE)

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 1326b68471e75c57a192980b3496eabf4dc08a39..00d8928ba96a35a368566288c6b074774ed82423 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="THREADSFLAG">
+        <if cond="USE_THREADS=='1'">multi</if>
+        <if cond="USE_THREADS=='0'">single</if>
+    </set>
 
     <set var="DEBUG_DEFINE">
         <if cond="FORMAT!='autoconf' and BUILD=='debug' and DEBUG_FLAG=='default'">__WXDEBUG__</if>
@@ -274,7 +278,7 @@
         <debug-info>$(DEBUGINFO)</debug-info>
         <debug-runtime-libs>$(DEBUGRUNTIME)</debug-runtime-libs>
         <optimize>$(OPTIMIZEFLAG)</optimize>
-        <threading>multi</threading>
+        <threading>$(THREADSFLAG)</threading>
         <runtime-libs>$(RUNTIME_LIBS)</runtime-libs>
         <cxx-rtti>$(EXCEPTIONSFLAG)</cxx-rtti>
         <cxx-exceptions>$(EXCEPTIONSFLAG)</cxx-exceptions>

diff --git a/build/bakefiles/config.bkl b/build/bakefiles/config.bkl
index c95da630f5de9f7de977eded98cfa07a4b3754ac..dd448177982b05b71d19faaf865d7837379b4a68 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_THREADS">
+        <values>0,1</values>
+        <default-value>1</default-value>
+        <description>
+            Enable threading in compiled code.
+        </description>
+    </option>
+    
     <option name="OFFICIAL_BUILD">
         <values>0,1</values>
         <default-value>0</default-value>
@@ -329,6 +337,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_THREADS">1</set>
         <set var="DEBUG_INFO">default</set>
         <set var="DEBUG_FLAG">default</set>
         <set var="MSLU">0</set>