more #defines, libraries and precompiled headers work

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

diff --git a/build/bakefiles/config.bkl b/build/bakefiles/config.bkl
index b061604ae9f2029150509e27d5e592be164aca22..811fb1e3efabf66baf843fc96a5afa52c45956e1 100644 (file)
--- a/build/bakefiles/config.bkl
+++ b/build/bakefiles/config.bkl
@@ -2,6 +2,9 @@
 <!-- $Id$ -->
 
 <makefile>
+    
+    <set var="BUILDING_LIB" overwrite="0">0</set>
+
 
     <option name="UNICODE">
         <values>0 1</values>
@@ -21,7 +24,7 @@
     
     <option name="MONOLITHIC">
         <values>0 1</values>
-        <default-value>0</default-value>
+        <default-value>1</default-value>
         <description>
             Multiple libraries or single huge monolithic one?
         </description>
@@ -43,19 +46,65 @@
         </description>
     </option>
 
-    <!-- Autoconf options: -->
+
+    <option name="OFFICIAL_BUILD">
+        <values>0 1</values>
+        <default-value>0</default-value>
+        <description>
+            Is this official build by wxWindows developers?
+        </description>
+    </option>
+    <option name="VENDOR">
+        <default-value>custom</default-value>
+        <description>
+            Use this to name your customized DLLs differently
+        </description>
+    </option>
+
+    <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.
+        </description>
+    </option>
+        
+
+
+    <!-- ================================================================== -->
+    <!--                             Autoconf                               -->
+    <!-- ================================================================== -->
+    
     <if cond="FORMAT=='autoconf'"> 
         <option name="DEREZ"/>
         <option name="TOOLKIT"/>
         <option name="TOOLKIT_LOWERCASE"/>
         <option name="TOOLKIT_VERSION"/>
         <option name="EXTRALIBS"/>
-        <option name="top_builddir"/>
         <option name="SAMPLES_RPATH_FLAG"/>
+        <set var="TOP_SRCDIR">$(top_srcdir)/</set>
     </if>
 
+    
+    <!-- ================================================================== -->
+    <!--                         Windows compilers                          -->
+    <!-- ================================================================== -->
+
     <if cond="FORMAT!='autoconf'">
-        <set var="TOOLKIT_VERSION"></set>
+        <set var="WXTOPDIR"/> <!-- to be overriden on bakefile cmd line -->
+
+        <set var="TOOLKIT">MSW</set>
+        <set var="TOOLKIT_LOWERCASE">$(TOOLKIT.lower())</set>
+        <set var="TOOLKIT_VERSION"/>
+        <set var="SAMPLES_RPATH_FLAG"/>
+        <set var="EXTRALIBS"/>
+
+        <set var="SRCDIR">
+            <if cond="BUILDING_LIB=='1'">..</if>
+            <if cond="BUILDING_LIB=='0'">.</if>
+        </set>
+        <set var="TOP_SRCDIR">$(SRCDIR)/$(WXTOPDIR)</set>
     </if>
 
 </makefile>