added USE_THREADS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32244 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -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)
|
||||
|
@@ -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>
|
||||
|
@@ -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>
|
||||
|
Reference in New Issue
Block a user