only use our background for children if it's inheritable

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

diff --git a/build/bakefiles/config.bkl b/build/bakefiles/config.bkl
index 4a0c65b716432f086f2a32c956b7205a4e49a36d..c95da630f5de9f7de977eded98cfa07a4b3754ac 100644 (file)
--- a/build/bakefiles/config.bkl
+++ b/build/bakefiles/config.bkl
@@ -131,6 +131,14 @@ Acts according to DEBUG_INFO by default.
         </description>
     </option>
     
         </description>
     </option>
     

+    <option name="USE_XRC">
+        <values>0,1</values>
+        <default-value>1</default-value>
+        <description>
+            Build wxXRC 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>


@@ -168,6 +176,14 @@ Acts according to DEBUG_INFO by default.
             Use this to name your customized DLLs differently
         </description>
     </option>
             Use this to name your customized DLLs differently
         </description>
     </option>

+    <!-- These basically do what vendor does in the places it didn't. -->
+    <!-- They should all be unified under some suitable descriptor    -->
+    <option name="WX_FLAVOUR">
+        <default-value></default-value>
+    </option>
+    <option name="WX_LIB_FLAVOUR">
+        <default-value></default-value>
+    </option>

 
     <option name="CFG">
         <default-value></default-value>
 
     <option name="CFG">
         <default-value></default-value>


@@ -206,6 +222,7 @@ to run the tests, include CppUnit library here.
         <option name="TOOLKIT_LOWERCASE"/>
         <option name="TOOLKIT_VERSION"/>
         <option name="TOOLCHAIN_NAME"/>
         <option name="TOOLKIT_LOWERCASE"/>
         <option name="TOOLKIT_VERSION"/>
         <option name="TOOLCHAIN_NAME"/>

+        <option name="TOOLCHAIN_FULLNAME"/>

         <option name="EXTRALIBS"/>
         <option name="EXTRALIBS_XML"/>
         <option name="EXTRALIBS_HTML"/>
         <option name="EXTRALIBS"/>
         <option name="EXTRALIBS_XML"/>
         <option name="EXTRALIBS_HTML"/>


@@ -213,6 +230,7 @@ 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="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"/>


@@ -263,6 +281,7 @@ it if SHARED=1 unless you know what you are doing.
             <if cond="COMPILER=='gcc'">-lopengl32 -lglu32</if>
         </set>
         <set var="EXTRALIBS_SDL"/>
             <if cond="COMPILER=='gcc'">-lopengl32 -lglu32</if>
         </set>
         <set var="EXTRALIBS_SDL"/>

+        <set var="EXTRALIBS_GNOMEPRINT"/>

 
         <set var="WITH_PLUGIN_SDL">0</set>
 
 
         <set var="WITH_PLUGIN_SDL">0</set>
 


@@ -304,6 +323,7 @@ Set the version of your Mingw installation here.
         <set var="RUNTIME_LIBS">dynamic</set>
         <set var="OFFICIAL_BUILD">0</set>
         <set var="USE_HTML">1</set>
         <set var="RUNTIME_LIBS">dynamic</set>
         <set var="OFFICIAL_BUILD">0</set>
         <set var="USE_HTML">1</set>

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

         <set var="USE_OPENGL">1</set>
         <set var="USE_ODBC">1</set>
         <set var="MONOLITHIC">0</set>
         <set var="USE_OPENGL">1</set>
         <set var="USE_ODBC">1</set>
         <set var="MONOLITHIC">0</set>


@@ -336,6 +356,9 @@ Set the version of your Mingw installation here.
         <set var="SHARED">0</set>
         <set var="WXUNIV">0</set>
         <set var="UNICODE">0</set>
         <set var="SHARED">0</set>
         <set var="WXUNIV">0</set>
         <set var="UNICODE">0</set>

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

     </if>
 
     <!-- No need for wxUniv on embedded devices (yet): -->
     </if>
 
     <!-- No need for wxUniv on embedded devices (yet): -->