trying to fix the bug which results in blocking forever inside Delete()

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

diff --git a/build/bakefiles/config.bkl b/build/bakefiles/config.bkl
index 72ac723d29a58ec6eb79460900ff34248f71785c..66f4388b235ccd27a3d1752f0478117f2a0c61ff 100644 (file)
--- a/build/bakefiles/config.bkl
+++ b/build/bakefiles/config.bkl
@@ -60,6 +60,15 @@
             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>
         
 
 
@@ -73,6 +82,7 @@
         <option name="TOOLKIT_LOWERCASE"/>
         <option name="TOOLKIT_VERSION"/>
         <option name="EXTRALIBS"/>
+        <option name="EXTRALIBS_GUI"/>
         <option name="SAMPLES_RPATH_FLAG"/>
         <set var="TOP_SRCDIR">$(top_srcdir)/</set>
     </if>
@@ -89,14 +99,31 @@
         <set var="TOOLKIT_LOWERCASE">$(TOOLKIT.lower())</set>
         <set var="TOOLKIT_VERSION"/>
         <set var="SAMPLES_RPATH_FLAG"/>
-        <option name="EXTRALIBS"/>
+        <set var="EXTRALIBS"/>
+        <set var="EXTRALIBS_GUI"/>
+        <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>