fixed bug in previous commit: WXTOPDIR not set

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

diff --git a/build/bakefiles/config.bkl b/build/bakefiles/config.bkl
index d6649fd5491daf0f046061fd78df5e4fbbc3f94a..77522ba1f47322280536d2c36ca5245d777311e4 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>
@@ -44,6 +47,31 @@
     </option>
 
 
+    <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                               -->
     <!-- ================================================================== -->
@@ -70,14 +98,30 @@
         <set var="TOOLKIT_LOWERCASE">$(TOOLKIT.lower())</set>
         <set var="TOOLKIT_VERSION"/>
         <set var="SAMPLES_RPATH_FLAG"/>
-        <option name="EXTRALIBS"/>
+        <set var="EXTRALIBS"/>
+        <set var="EXTRACFLAGS"/>
 
         <set var="SRCDIR">
             <if cond="BUILDING_LIB=='1'">..</if>
             <if cond="BUILDING_LIB=='0'">.</if>
         </set>
         <set var="TOP_SRCDIR">$(SRCDIR)/$(WXTOPDIR)</set>
-        <set var="BUILDDIR">objs_$(COMPILER)</set>
     </if>
-
+    
+    <if cond="FORMAT=='mingw'">
+        <option name="GCC_VERSION">
+            <values>3 2.95</values>
+            <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
+            </description>
+        </option>
+        <set var="GCCFLAGS">
+            <if cond="GCC_VERSION=='2.95'">-fvtable-thunks</if>
+        </set>
+        <set var="EXTRACFLAGS">$(GCCFLAGS) -DHAVE_W32API_H</set>
+    </if>
+    
 </makefile>