naming convention fixes

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

diff --git a/build/bakefiles/multilib.bkl b/build/bakefiles/multilib.bkl
index 9803570a6477d838af65169c72298324163a8591..d661d444213384cbd0475f9cc3150b0671b25286 100644 (file)
--- a/build/bakefiles/multilib.bkl
+++ b/build/bakefiles/multilib.bkl
@@ -1,26 +1,42 @@
 <?xml version="1.0" ?>
 <makefile>
 <?xml version="1.0" ?>
 <makefile>

+    
+    <!-- ================================================================= -->
+    <!--                            wxBase library                         -->
+    <!-- ================================================================= -->
+    
+    <dll id="basedll" template="wx_dll"
+         cond="SHARED=='1' and MONOLITHIC=='0'">
+        <define>WXMAKINGDLL</define>
+        <define>wxUSE_BASE=1</define>
+        <define>wxUSE_GUI=0</define> 
+        <sources>$(BASE_SRC) $(BASE_AND_GUI_SRC)</sources>
+    </dll>
+    
+    <lib id="baselib" template="wx_lib"
+         cond="SHARED=='0' and MONOLITHIC=='0'">
+        <define>wxUSE_BASE=1</define> 
+        <define>wxUSE_GUI=0</define> 
+        <sources>$(BASE_SRC) $(BASE_AND_GUI_SRC)</sources>
+    </lib>

 
     <!-- ================================================================= -->
     <!--                           Main GUI library                        -->
     <!-- ================================================================= -->
     
     <dll id="coredll" template="wx_dll"
 
     <!-- ================================================================= -->
     <!--                           Main GUI library                        -->
     <!-- ================================================================= -->
     
     <dll id="coredll" template="wx_dll"

-         cond="SHARED=='1' and MONOLITHIC=='0'">
+         cond="SHARED=='1' and USE_GUI=='1' and MONOLITHIC=='0'">

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

-        <sources>$(BASE_SRC) $(CORE_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>
+        <define>wxUSE_BASE=0</define> 
+        <sources>$(BASE_AND_GUI_SRC) $(CORE_SRC)</sources>
+        
+        <wx-lib>base</wx-lib>

     </dll>
     
     <lib id="corelib" template="wx_lib"
     </dll>
     
     <lib id="corelib" template="wx_lib"

-         cond="SHARED=='0' and MONOLITHIC=='0'">
-        <sources>$(BASE_SRC) $(CORE_SRC)</sources>
+         cond="SHARED=='0' and USE_GUI=='1' and MONOLITHIC=='0'">
+        <define>wxUSE_BASE=0</define> 
+        <sources>$(BASE_AND_GUI_SRC) $(CORE_SRC)</sources>

     </lib>
 
     
     </lib>
 
     


@@ -29,14 +45,15 @@
     <!-- ================================================================ -->
     
     <dll id="htmldll" template="wx_dll"
     <!-- ================================================================ -->
     
     <dll id="htmldll" template="wx_dll"

-         cond="SHARED=='1' and MONOLITHIC=='0'">
+         cond="SHARED=='1' and USE_GUI=='1' and MONOLITHIC=='0'">

         <define>WXMAKINGDLL</define>
         <sources>$(HTML_SRC)</sources>
         <wx-lib>core</wx-lib>
         <define>WXMAKINGDLL</define>
         <sources>$(HTML_SRC)</sources>
         <wx-lib>core</wx-lib>

+        <wx-lib>base</wx-lib>

     </dll>
     
     <lib id="htmllib" template="wx_lib"
     </dll>
     
     <lib id="htmllib" template="wx_lib"

-         cond="SHARED=='0' and MONOLITHIC=='0'">
+         cond="SHARED=='0' and USE_GUI=='1' and MONOLITHIC=='0'">

         <sources>$(HTML_SRC)</sources>
     </lib>
 
         <sources>$(HTML_SRC)</sources>
     </lib>