naming convention fixes

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

diff --git a/build/bakefiles/multilib.bkl b/build/bakefiles/multilib.bkl
index bb6dd8c2e4ecdee99f90722b2f9b8194950bbe55..d661d444213384cbd0475f9cc3150b0671b25286 100644 (file)
--- a/build/bakefiles/multilib.bkl
+++ b/build/bakefiles/multilib.bkl
@@ -8,21 +8,13 @@
     <dll id="basedll" template="wx_dll"
          cond="SHARED=='1' and MONOLITHIC=='0'">
         <define>WXMAKINGDLL</define>
-        <define>__WXBASE__</define> 
         <define>wxUSE_BASE=1</define>
         <define>wxUSE_GUI=0</define> 
         <sources>$(BASE_SRC) $(BASE_AND_GUI_SRC)</sources>
-        
-        <library>$(LIB_ZLIB)</library>
-        <library>$(LIB_REGEX)</library>
-        <library>$(LIB_PNG)</library>
-        <library>$(LIB_JPEG)</library>
-        <library>$(LIB_TIFF)</library>
     </dll>
     
     <lib id="baselib" template="wx_lib"
          cond="SHARED=='0' and MONOLITHIC=='0'">
-        <define>__WXBASE__</define> 
         <define>wxUSE_BASE=1</define> 
         <define>wxUSE_GUI=0</define> 
         <sources>$(BASE_SRC) $(BASE_AND_GUI_SRC)</sources>
@@ -35,15 +27,15 @@
     <dll id="coredll" template="wx_dll"
          cond="SHARED=='1' and USE_GUI=='1' and MONOLITHIC=='0'">
         <define>WXMAKINGDLL</define>
+        <define>wxUSE_BASE=0</define> 
         <sources>$(BASE_AND_GUI_SRC) $(CORE_SRC)</sources>
         
         <wx-lib>base</wx-lib>
-      
-        <library>$(LIB_ODBC)</library>        
     </dll>
     
     <lib id="corelib" template="wx_lib"
          cond="SHARED=='0' and USE_GUI=='1' and MONOLITHIC=='0'">
+        <define>wxUSE_BASE=0</define> 
         <sources>$(BASE_AND_GUI_SRC) $(CORE_SRC)</sources>
     </lib>