Laid groundwork for scrolling.

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

diff --git a/build/bakefiles/config.bkl b/build/bakefiles/config.bkl
index 34c0f61b8a2a1554dfde8e00bbcd54eab6556b3b..9e2d2e887ac243765b76cdb296fff3a4260e11e4 100644 (file)
--- a/build/bakefiles/config.bkl
+++ b/build/bakefiles/config.bkl
@@ -5,50 +5,132 @@
     
     <set var="BUILDING_LIB" overwrite="0">0</set>
 
     
     <set var="BUILDING_LIB" overwrite="0">0</set>
 

+    <option name="SHARED">
+        <values>0,1</values>
+        <values-description>,DLL</values-description>
+        <default-value>1</default-value>
+        <description>
+            What type of library to build?
+        </description>
+    </option>
+    
+    <option name="WXUNIV">
+        <values>0,1</values>
+        <values-description>,Universal</values-description>
+        <default-value>0</default-value>
+        <description>
+            Build wxUniversal instead of native port?
+        </description>
+    </option>

 
     <option name="UNICODE">
 
     <option name="UNICODE">

-        <values>0 1</values>
-        <default-value>0</default-value>
+        <values>0,1</values>
+        <values-description>,Unicode</values-description>
+        <default-value>0</default-value>        

         <description>
             Compile Unicode build of wxWindows?
         </description>
     </option>
 
         <description>
             Compile Unicode build of wxWindows?
         </description>
     </option>
 

-    <option name="SHARED">
-        <values>0 1</values>
-        <default-value>1</default-value>
+    <if cond="FORMAT!='autoconf' and FORMAT!='watcom'">
+        <option name="MSLU">
+            <values>0,1</values>
+            <default-value>0</default-value>        
+            <description>
+                Use MSLU library when building Unicode version.
+            </description>
+        </option>
+    </if>
+    <if cond="FORMAT=='autoconf' or FORMAT=='watcom'">
+        <set var="MSLU">0</set>
+    </if>
+
+    <option name="BUILD">
+        <values>debug,release</values>
+        <values-description>Debug,Release</values-description>
+        <default-value>release</default-value>

         <description>
         <description>

-            What type of library to build?
+            Type of compiled binaries
+        </description>
+    </option>
+    
+    <option name="DEBUG_INFO">
+        <values>0,1,default</values>
+        <default-value>default</default-value>
+        <description>
+Should debugging info be included in the executables? The default value
+"default" means that debug info will be included if BUILD=debug
+and not included if BUILD=release.
+        </description>
+    </option>
+    
+    <option name="DEBUG_FLAG">
+        <values>0,1,default</values>
+        <default-value>default</default-value>
+        <description>
+Should __WXDEBUG__ be defined? The default value "default" means that it will
+be defined if BUILD=debug and not defined if BUILD=release.

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

+
+    <if cond="FORMAT=='msvc'">
+        <option name="DEBUG_RUNTIME_LIBS">
+            <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 DEBUG_INFO by default.
+            </description>
+        </option>
+    </if>
+    <if cond="FORMAT!='msvc'">
+        <set var="DEBUG_RUNTIME_LIBS">default</set>
+    </if>

     
     <option name="MONOLITHIC">
     
     <option name="MONOLITHIC">

-        <values>0 1</values>
-        <default-value>1</default-value>
+        <values>0,1</values>
+        <values-description>Multilib,Monolithic</values-description>
+        <default-value>0</default-value>

         <description>
             Multiple libraries or single huge monolithic one?
         </description>
     </option>
     
     <option name="USE_GUI">
         <description>
             Multiple libraries or single huge monolithic one?
         </description>
     </option>
     
     <option name="USE_GUI">

-        <values>0 1</values>
+        <values>0,1</values>
+        <values-description>Base,GUI</values-description>

         <default-value>1</default-value>
         <description>
             Build GUI libraries?
         </description>
     </option>
         <default-value>1</default-value>
         <description>
             Build GUI libraries?
         </description>
     </option>

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

         <default-value>0</default-value>
         <description>
         <default-value>0</default-value>
         <description>

-            Build wxUniversal instead of native port?
+            Build OpenGL canvas library (USE_GUI must be 1)?

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

-
-
+    
+    <option name="USE_ODBC">
+        <values>0,1</values>
+        <default-value>0</default-value>
+        <description>
+            Build ODBC database classes (USE_GUI must be 1)?
+        </description>
+    </option>
+    

     <option name="OFFICIAL_BUILD">
     <option name="OFFICIAL_BUILD">

-        <values>0 1</values>
+        <values>0,1</values>

         <default-value>0</default-value>
         <description>
             Is this official build by wxWindows developers?
         <default-value>0</default-value>
         <description>
             Is this official build by wxWindows developers?


@@ -64,12 +146,11 @@
     <option name="CFG">
         <default-value></default-value>
         <description>
     <option name="CFG">
         <default-value></default-value>
         <description>

-            Name of your custom configuration. This affects directory
-            where object files are stored as well as the location of
-            compiled .lib files and setup.h under the lib/ toplevel directory.
+Name of your custom configuration. This affects directory
+where object files are stored as well as the location of
+compiled .lib files and setup.h under the lib/ toplevel directory.

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

-        

 
 
     <!-- ================================================================== -->
 
 
     <!-- ================================================================== -->


@@ -83,11 +164,17 @@
         <option name="TOOLKIT_VERSION"/>
         <option name="TOOLCHAIN_NAME"/>
         <option name="EXTRALIBS"/>
         <option name="TOOLKIT_VERSION"/>
         <option name="TOOLCHAIN_NAME"/>
         <option name="EXTRALIBS"/>

+        <option name="EXTRALIBS_XML"/>
+        <option name="EXTRALIBS_ODBC"/>

         <option name="EXTRALIBS_GUI"/>
         <option name="EXTRALIBS_GUI"/>

+        <option name="EXTRALIBS_OPENGL"/>
+        <option name="HOST_SUFFIX"/>

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

+        <option name="SAMPLES_RPATH_POSTLINK"/>

         
         <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 -->

     </if>
 
     
     </if>
 
     


@@ -97,12 +184,12 @@
 
     <if cond="FORMAT!='autoconf'">
         <option name="RUNTIME_LIBS">
 
     <if cond="FORMAT!='autoconf'">
         <option name="RUNTIME_LIBS">

-            <values>dynamic static</values>
+            <values>dynamic,static</values>

             <default-value>dynamic</default-value>
             <description>
             <default-value>dynamic</default-value>
             <description>

-                Version of C runtime library to use. You can change this to
-                static if SHARED=0, but it is highly recommended to not do
-                it if SHARED=1 unless you know what you are doing.
+Version of C runtime library to use. You can change this to
+static if SHARED=0, but it is highly recommended to not do
+it if SHARED=1 unless you know what you are doing.

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


@@ -111,13 +198,15 @@
         <set var="TOOLKIT">MSW</set>
         <set var="TOOLKIT_LOWERCASE">$(TOOLKIT.lower())</set>
         <set var="TOOLKIT_VERSION"/>
         <set var="TOOLKIT">MSW</set>
         <set var="TOOLKIT_LOWERCASE">$(TOOLKIT.lower())</set>
         <set var="TOOLKIT_VERSION"/>

-        <set var="SAMPLES_RPATH_FLAG"/>
+        <set var="HOST_SUFFIX"/>

         <set var="EXTRALIBS"/>
         <set var="EXTRALIBS"/>

+        <set var="EXTRALIBS_XML"/>
+        <set var="EXTRALIBS_ODBC"/>

         <set var="EXTRALIBS_GUI"/>
         <set var="EXTRACFLAGS"/>
 
         <set var="SRCDIR">
         <set var="EXTRALIBS_GUI"/>
         <set var="EXTRACFLAGS"/>
 
         <set var="SRCDIR">

-            <if cond="BUILDING_LIB=='1'">..</if>
+            <if cond="BUILDING_LIB=='1'">..$(DIRSEP)..</if>

             <if cond="BUILDING_LIB=='0'">.</if>
         </set>
         <set var="TOP_SRCDIR">$(SRCDIR)/$(WXTOPDIR)</set>
             <if cond="BUILDING_LIB=='0'">.</if>
         </set>
         <set var="TOP_SRCDIR">$(SRCDIR)/$(WXTOPDIR)</set>


@@ -125,12 +214,12 @@
     
     <if cond="FORMAT=='mingw'">
         <option name="GCC_VERSION">
     
     <if cond="FORMAT=='mingw'">
         <option name="GCC_VERSION">

-            <values>3 2.95</values>
+            <values>3,2.95</values>

             <default-value>3</default-value>
             <description>
             <default-value>3</default-value>
             <description>

-                Set the version of your Mingw installation here.
-                "3" ...... this is for Mingw 2.0 or newer that cames with gcc3
-                "2.95" ... for Mingw 1.1 or any of the older versions
+Set the version of your Mingw installation here.
+    "3" ...... this is for Mingw 2.0 or newer (comes with gcc3)
+    "2.95" ... for Mingw 1.1 or any of the older versions

             </description>
         </option>
         <set var="GCCFLAGS">
             </description>
         </option>
         <set var="GCCFLAGS">