preliminary work on borland bakefiles

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21433 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index d2b2082d9f14b8bc9f20a7d548e00c888fc4e828..311628f30af039c7b178973eb49670b50f9a5e7f 100644 (file)
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -95,6 +95,9 @@
 
     <set var="LIBDIRNAME">
         <if cond="FORMAT=='autoconf'">$(top_builddir)lib</if>
 
     <set var="LIBDIRNAME">
         <if cond="FORMAT=='autoconf'">$(top_builddir)lib</if>

+        <if cond="FORMAT!='autoconf'">
+            $(WXTOPDIR)$(DIRSEP)lib$(DIRSEP)$(COMPILER)
+        </if>

     </set>
 
     <!-- =============================================================== -->
     </set>
 
     <!-- =============================================================== -->

diff --git a/build/bakefiles/config.bkl b/build/bakefiles/config.bkl
index 21241df762cd4665eb061142d5b93869353c50cd..06a48271978451cf758bd093a3f4427c78e57542 100644 (file)
--- a/build/bakefiles/config.bkl
+++ b/build/bakefiles/config.bkl
@@ -21,7 +21,7 @@
     
     <option name="MONOLITHIC">
         <values>0 1</values>
     
     <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>
         <description>
             Multiple libraries or single huge monolithic one?
         </description>


@@ -43,7 +43,11 @@
         </description>
     </option>
 
         </description>
     </option>
 

-    <!-- Autoconf options: -->
+
+    <!-- ================================================================== -->
+    <!--                             Autoconf                               -->
+    <!-- ================================================================== -->
+    

     <if cond="FORMAT=='autoconf'"> 
         <option name="DEREZ"/>
         <option name="TOOLKIT"/>
     <if cond="FORMAT=='autoconf'"> 
         <option name="DEREZ"/>
         <option name="TOOLKIT"/>


@@ -53,8 +57,20 @@
         <option name="SAMPLES_RPATH_FLAG"/>
     </if>
 
         <option name="SAMPLES_RPATH_FLAG"/>
     </if>
 

+    
+    <!-- ================================================================== -->
+    <!--                         Windows compilers                          -->
+    <!-- ================================================================== -->
+

     <if cond="FORMAT!='autoconf'">
     <if cond="FORMAT!='autoconf'">

-        <set var="TOOLKIT_VERSION"></set>
+        <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">..</set>
+        <set var="BUILDDIR">objs_$(COMPILER)</set>

     </if>
 
 </makefile>
     </if>
 
 </makefile>