mention wxLogInterposer(Temp)

[wxWidgets.git] / build / bakefiles / config.bkl

diff --git a/build/bakefiles/config.bkl b/build/bakefiles/config.bkl
index a79734ebcdff660b09bfc4272410ebcc6907d263..a17f588216df3d531a54383e166d3b3eb17d8437 100644 (file)
--- a/build/bakefiles/config.bkl
+++ b/build/bakefiles/config.bkl
@@ -49,7 +49,7 @@
     <option name="UNICODE">
         <values>0,1</values>
         <values-description>,Unicode</values-description>
     <option name="UNICODE">
         <values>0,1</values>
         <values-description>,Unicode</values-description>

-        <default-value>0</default-value>
+        <default-value>1</default-value>

         <description>
             Compile Unicode build of wxWidgets?
         </description>
         <description>
             Compile Unicode build of wxWidgets?
         </description>


@@ -213,6 +213,14 @@ Acts according to BUILD by default.
         </description>
     </option>
 
         </description>
     </option>
 

+    <option name="USE_STC">
+        <values>0,1</values>
+        <default-value>1</default-value>
+        <description>
+            Build wxStyledTextCtrl library (USE_GUI must be 1)?
+        </description>
+    </option>
+

     <option name="USE_OPENGL">
         <values>0,1</values>
         <default-value>0</default-value>
     <option name="USE_OPENGL">
         <values>0,1</values>
         <default-value>0</default-value>


@@ -344,6 +352,7 @@ to run the tests, include CppUnit library here.
         <option name="EXTRALIBS_OPENGL"/>
         <option name="EXTRALIBS_SDL"/>
         <option name="EXTRALIBS_GNOMEPRINT"/>
         <option name="EXTRALIBS_OPENGL"/>
         <option name="EXTRALIBS_SDL"/>
         <option name="EXTRALIBS_GNOMEPRINT"/>

+        <option name="CXXWARNINGS"/>

         <option name="HOST_SUFFIX"/>
         <option name="SAMPLES_RPATH_FLAG"/>
         <option name="SAMPLES_RPATH_POSTLINK"/>
         <option name="HOST_SUFFIX"/>
         <option name="SAMPLES_RPATH_FLAG"/>
         <option name="SAMPLES_RPATH_POSTLINK"/>


@@ -435,6 +444,7 @@ Set the version of your Mingw installation here.
         <set var="OFFICIAL_BUILD">0</set>
         <set var="USE_AUI">1</set>
         <set var="USE_RICHTEXT">1</set>
         <set var="OFFICIAL_BUILD">0</set>
         <set var="USE_AUI">1</set>
         <set var="USE_RICHTEXT">1</set>

+        <set var="USE_STC">1</set>

         <set var="USE_HTML">1</set>
         <set var="USE_MEDIA">1</set>
         <set var="USE_XRC">1</set>
         <set var="USE_HTML">1</set>
         <set var="USE_MEDIA">1</set>
         <set var="USE_XRC">1</set>


@@ -460,7 +470,7 @@ Set the version of your Mingw installation here.
         <set var="BUILD">debug</set>
         <set var="SHARED">0</set>
         <set var="WXUNIV">0</set>
         <set var="BUILD">debug</set>
         <set var="SHARED">0</set>
         <set var="WXUNIV">0</set>

-        <set var="UNICODE">0</set>
+        <set var="UNICODE">1</set>

         <!-- Free version does not distribute OpenGL,
              in commercial distribution better use dmars_smake format -->
         <set var="USE_OPENGL">0</set>
         <!-- Free version does not distribute OpenGL,
              in commercial distribution better use dmars_smake format -->
         <set var="USE_OPENGL">0</set>