fixed dll extension when crosscompiling for win32

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

diff --git a/build/bakefiles/monolithic.bkl b/build/bakefiles/monolithic.bkl
index 02670d651c448deb6fd361d6f1da52287342da90..294c92921aee38bedd5596aff7906e221e972515 100644 (file)
--- a/build/bakefiles/monolithic.bkl
+++ b/build/bakefiles/monolithic.bkl
@@ -1,25 +1,27 @@
 <?xml version="1.0" ?>
 <!-- $Id$ -->
 <makefile>
 <?xml version="1.0" ?>
 <!-- $Id$ -->
 <makefile>

+    
+    <set var="MONOLIB_SRC">
+        <if cond="USE_GUI=='0'">
+            src/common/init.cpp $(BASE_SRC) $(BASE_AND_GUI_SRC)
+        </if>
+        <if cond="USE_GUI=='1'">
+            $(BASE_SRC) $(BASE_AND_GUI_SRC) $(CORE_SRC) $(HTML_SRC)
+        </if>
+    </set>

 
     <dll id="monodll" template="wx_dll"
          cond="SHARED=='1' and MONOLITHIC=='1'">
 
     <dll id="monodll" template="wx_dll"
          cond="SHARED=='1' and MONOLITHIC=='1'">

-        <define>__WXBASE__</define> 
+        <define>wxUSE_BASE=1</define> 

         <define>WXMAKINGDLL</define>
         <define>WXMAKINGDLL</define>

-        <sources>$(BASE_SRC) $(CORE_SRC) $(HTML_SRC)</sources>
-      
-        <library>$(LIB_ZLIB)</library>
-        <library>$(LIB_REGEX)</library>
-        <library>$(LIB_PNG)</library>
-        <library>$(LIB_JPEG)</library>
-        <library>$(LIB_TIFF)</library>
-        <library>$(LIB_ODBC)</library>
+        <sources>$(MONOLIB_SRC)</sources>

     </dll>
     
     <lib id="monolib" template="wx_lib"
          cond="SHARED=='0' and MONOLITHIC=='1'">
     </dll>
     
     <lib id="monolib" template="wx_lib"
          cond="SHARED=='0' and MONOLITHIC=='1'">

-        <define>__WXBASE__</define> 
-        <sources>$(BASE_SRC) $(CORE_SRC) $(HTML_SRC)</sources>
+        <define>wxUSE_BASE=1</define> 
+        <sources>$(MONOLIB_SRC)</sources>

     </lib>
 
 </makefile>
     </lib>
 
 </makefile>