Removed wxGetOsVersion stub. It's now handled by utilscmn.cpp.

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

diff --git a/build/bakefiles/config.bkl b/build/bakefiles/config.bkl
index 4afe0321f0e7d85c69788438dadedc3682377c1d..d6649fd5491daf0f046061fd78df5e4fbbc3f94a 100644 (file)
--- a/build/bakefiles/config.bkl
+++ b/build/bakefiles/config.bkl
@@ -19,10 +19,9 @@
         </description>
     </option>
     
-    <!-- FIXME - to be option, not hardcoded value!! -->
     <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>
@@ -44,19 +43,41 @@
         </description>
     </option>
 
-    <!-- Autoconf options: -->
+
+    <!-- ================================================================== -->
+    <!--                             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"/>
+        <option name="EXTRALIBS"/>
+
+        <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>
 
 </makefile>