X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aae7e12e1db7f327f38e6d7442bd89bd9566d25e..80752b57a9bbdfa7613a917d9ece00fc47677080:/build/bakefiles/config.bkl

diff --git a/build/bakefiles/config.bkl b/build/bakefiles/config.bkl
index 3ae31ad753..13989771be 100644
--- a/build/bakefiles/config.bkl
+++ b/build/bakefiles/config.bkl
@@ -79,7 +79,6 @@
 
     <if cond="FORMAT=='msvc'">
         <option name="TARGET_CPU">
-            <values>AMD64,IA64</values>
             <default-value>$(DOLLAR)(CPU)</default-value>
             <description>
 The target processor architecture must be specified when it is not X86.
@@ -87,6 +86,8 @@ This does not affect the compiler output, so you still need to make sure
 your environment is set up appropriately with the correct compiler in the
 PATH. Rather it affects some options passed to some of the common build
 utilities such as the resource compiler and the linker.
+
+Accepted values: AMD64, IA64.
             </description>
         </option>
     </if>
@@ -180,6 +181,14 @@ Acts according to BUILD by default.
         </description>
     </option>
 
+    <option name="USE_MEDIA">
+        <values>0,1</values>
+        <default-value>1</default-value>
+        <description>
+            Build multimedia library (USE_GUI must be 1)?
+        </description>
+    </option>
+
     <option name="USE_XRC">
         <values>0,1</values>
         <default-value>1</default-value>
@@ -188,6 +197,22 @@ Acts according to BUILD by default.
         </description>
     </option>
 
+    <option name="USE_AUI">
+        <values>0,1</values>
+        <default-value>1</default-value>
+        <description>
+            Build wxAUI library (USE_GUI must be 1)?
+        </description>
+    </option>
+
+    <option name="USE_RICHTEXT">
+        <values>0,1</values>
+        <default-value>1</default-value>
+        <description>
+            Build wxRichTextCtrl library (USE_GUI must be 1)?
+        </description>
+    </option>
+
     <option name="USE_OPENGL">
         <values>0,1</values>
         <default-value>0</default-value>
@@ -211,7 +236,7 @@ Acts according to BUILD by default.
     </set>
     <option name="USE_QA">
         <values>0,1</values>
-        <default-value>USE_QA_DEFAULT</default-value>
+        <default-value>$(USE_QA_DEFAULT)</default-value>
         <description>
             Build quality assurance classes library (USE_GUI must be 1)?
         </description>
@@ -295,7 +320,6 @@ to run the tests, include CppUnit library here.
     <!-- ================================================================== -->
 
     <if cond="FORMAT=='autoconf'">
-        <option name="REZ"/>
         <option name="DEREZ"/>
         <option name="TOOLKIT"/>
         <option name="TOOLKIT_LOWERCASE"/>
@@ -403,7 +427,10 @@ Set the version of your Mingw installation here.
     <if cond="FORMAT_SUPPORTS_CONDITIONS=='0'">
         <set var="RUNTIME_LIBS">dynamic</set>
         <set var="OFFICIAL_BUILD">0</set>
+        <set var="USE_AUI">1</set>
+        <set var="USE_RICHTEXT">1</set>
         <set var="USE_HTML">1</set>
+        <set var="USE_MEDIA">1</set>
         <set var="USE_XRC">1</set>
         <set var="USE_OPENGL">1</set>
         <set var="USE_ODBC">1</set>