fixed dll extension when crosscompiling for win32

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

diff --git a/build/bakefiles/config.bkl b/build/bakefiles/config.bkl
index 06a48271978451cf758bd093a3f4427c78e57542..cc0e95b2cbc7b30d27bb68db0d585ece619306ce 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>
@@ -55,6 +58,7 @@
         <option name="TOOLKIT_VERSION"/>
         <option name="EXTRALIBS"/>
         <option name="SAMPLES_RPATH_FLAG"/>
+        <set var="TOP_SRCDIR">$(top_srcdir)/</set>
     </if>
 
     
@@ -63,13 +67,19 @@
     <!-- ================================================================== -->
 
     <if cond="FORMAT!='autoconf'">
+        <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">..</set>
+        <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>