No changes, just a typo fix in wxRichTextCtrl UI code.

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

diff --git a/build/bakefiles/config.bkl b/build/bakefiles/config.bkl
index a54e5b2335292a9ec352ee6835faa0526012d627..e1748c9ac63b29432175bdc010a1c475ec2d5cc9 100644 (file)
--- a/build/bakefiles/config.bkl
+++ b/build/bakefiles/config.bkl
@@ -103,7 +103,8 @@ 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.
 
 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.
+Accepted values: IA64, X64
+(AMD64 accepted as synonym for X64 but should not be used any more).

             </description>
         </option>
     </if>
             </description>
         </option>
     </if>


@@ -134,10 +135,11 @@ and not included if BUILD=release.
 
     <option name="DEBUG_FLAG">
         <values>0,1,default</values>
 
     <option name="DEBUG_FLAG">
         <values>0,1,default</values>

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

         <description>
         <description>

-Should __WXDEBUG__ be defined? The default value "default" means that it will
-be defined if BUILD=debug and not defined if BUILD=release.
+Value of wxDEBUG_LEVEL. The default value is the same as 1 and means that all
+but expensive assert checks are enabled, use 0 to completely remove debugging
+code.

         </description>
     </option>
 
         </description>
     </option>
 


@@ -146,8 +148,8 @@ be defined if BUILD=debug and not defined if BUILD=release.
             <values>0,1,default</values>
             <default-value>default</default-value>
             <description>
             <values>0,1,default</values>
             <default-value>default</default-value>
             <description>

-Should link against debug RTL (msvcrtd.dll) or release (msvcrt.dll)?
-Acts according to BUILD by default.
+Link against debug (e.g. msvcrtd.dll) or release (msvcrt.dll) RTL?
+Default is to use debug CRT if and only if BUILD==debug.

             </description>
         </option>
     </if>
             </description>
         </option>
     </if>


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

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

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


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

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

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


@@ -292,15 +310,13 @@ Acts according to BUILD by default.
         </description>
     </option>
 
         </description>
     </option>
 

-    <if cond="FORMAT!='autoconf'">
-        <option name="USE_GDIPLUS">
-            <values>0,1</values>
-            <default-value>0</default-value>
-            <description>
-                Link with gdiplus.lib? (Needed for wxGraphicsContext, will also set wxUSE_GRAPHICS_CONTEXT)
-            </description>
-       </option>
-    </if>
+    <option name="USE_CAIRO">
+        <values>0,1</values>
+        <default-value>0</default-value>
+        <description>
+            Enable wxCairoContext for platforms other than Linux/GTK.
+        </description>
+    </option>

 
     <option name="OFFICIAL_BUILD">
         <values>0,1</values>
 
     <option name="OFFICIAL_BUILD">
         <values>0,1</values>


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

-        <option name="EXTRALIBS_GNOMEPRINT"/>

         <option name="CXXWARNINGS"/>
         <option name="HOST_SUFFIX"/>
         <option name="DYLIB_RPATH_INSTALL"/>
         <option name="CXXWARNINGS"/>
         <option name="HOST_SUFFIX"/>
         <option name="DYLIB_RPATH_INSTALL"/>


@@ -381,7 +396,7 @@ to run the tests, include CppUnit library here.
 
         <set var="TOP_SRCDIR">$(top_srcdir)/</set>
         <set var="RUNTIME_LIBS">dynamic</set>
 
         <set var="TOP_SRCDIR">$(top_srcdir)/</set>
         <set var="RUNTIME_LIBS">dynamic</set>

-        <set var="WXTOPDIR"/> <!-- to be overriden on bakefile cmd line -->
+        <set var="WXTOPDIR"/> <!-- to be overridden on bakefile cmd line -->

 
         <option name="WITH_PLUGIN_SDL">
             <values>0,1</values>
 
         <option name="WITH_PLUGIN_SDL">
             <values>0,1</values>


@@ -406,7 +421,7 @@ it if SHARED=1 unless you know what you are doing.
             </description>
         </option>
 
             </description>
         </option>
 

-        <set var="WXTOPDIR"/> <!-- to be overriden on bakefile cmd line -->
+        <set var="WXTOPDIR"/> <!-- to be overridden on bakefile cmd line -->

 
         <set var="TOOLKIT" overwrite="0">
             <if cond="FORMAT=='msevc4prj'">WINCE</if>
 
         <set var="TOOLKIT" overwrite="0">
             <if cond="FORMAT=='msevc4prj'">WINCE</if>


@@ -415,7 +430,6 @@ it if SHARED=1 unless you know what you are doing.
             <if cond="FORMAT=='msvs2005prj' and MSVS_PLATFORMS=='win32'">MSW</if>
             <if cond="FORMAT=='msvs2008prj' and MSVS_PLATFORMS=='win32'">MSW</if>
             <if cond="FORMAT not in ['msevc4prj','msvs2005prj','msvs2008prj'] and PLATFORM_WIN32=='1'">MSW</if>
             <if cond="FORMAT=='msvs2005prj' and MSVS_PLATFORMS=='win32'">MSW</if>
             <if cond="FORMAT=='msvs2008prj' and MSVS_PLATFORMS=='win32'">MSW</if>
             <if cond="FORMAT not in ['msevc4prj','msvs2005prj','msvs2008prj'] and PLATFORM_WIN32=='1'">MSW</if>

-            <if cond="PLATFORM_MSDOS=='1'">MGL</if>

             <if cond="PLATFORM_OS2=='1'">PM</if>
         </set>
         <set var="TOOLKIT_LOWERCASE">$(TOOLKIT.lower())</set>
             <if cond="PLATFORM_OS2=='1'">PM</if>
         </set>
         <set var="TOOLKIT_LOWERCASE">$(TOOLKIT.lower())</set>


@@ -468,10 +482,12 @@ Set the version of your Mingw installation here.
         <set var="RUNTIME_LIBS">dynamic</set>
         <set var="OFFICIAL_BUILD">0</set>
         <set var="USE_AUI">1</set>
         <set var="RUNTIME_LIBS">dynamic</set>
         <set var="OFFICIAL_BUILD">0</set>
         <set var="USE_AUI">1</set>

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

         <set var="USE_PROPGRID">1</set>
         <set var="USE_RICHTEXT">1</set>
         <set var="USE_STC">1</set>
         <set var="USE_HTML">1</set>
         <set var="USE_PROPGRID">1</set>
         <set var="USE_RICHTEXT">1</set>
         <set var="USE_STC">1</set>
         <set var="USE_HTML">1</set>

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

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


@@ -481,7 +497,7 @@ Set the version of your Mingw installation here.
         <set var="USE_EXCEPTIONS">1</set>
         <set var="USE_RTTI">1</set>
         <set var="USE_THREADS">1</set>
         <set var="USE_EXCEPTIONS">1</set>
         <set var="USE_RTTI">1</set>
         <set var="USE_THREADS">1</set>

-        <if cond="FORMAT!='autoconf'"><set var="USE_GDIPLUS">0</set></if>
+        <set var="USE_CAIRO">0</set>

         <set var="DEBUG_INFO">$(DEBUG_INFO_DEFAULT)</set>
         <set var="DEBUG_FLAG">default</set>
         <set var="MSLU">0</set>
         <set var="DEBUG_INFO">$(DEBUG_INFO_DEFAULT)</set>
         <set var="DEBUG_FLAG">default</set>
         <set var="MSLU">0</set>


@@ -515,11 +531,4 @@ Set the version of your Mingw installation here.
         </if>
     </if>
 
         </if>
     </if>
 

-    <!-- Need for wxUniv within wxMGL: -->
-    <if cond="FORMAT!='autoconf' and TOOLKIT=='MGL'">
-        <set var="WXUNIV">1</set>
-        <set var="USE_THREADS">0</set>
-        <set var="RUNTIME_LIBS">static</set>
-    </if>
-

 </makefile>
 </makefile>