STL-ification patch for wxMSW and wxGTK.

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

diff --git a/build/bakefiles/multilib.bkl b/build/bakefiles/multilib.bkl
index 78561c9ddaecfa66d34c07ae07a3098c749cd999..215ea28a4db488aa725d31e10c6fde17c5f68f25 100644 (file)
--- a/build/bakefiles/multilib.bkl
+++ b/build/bakefiles/multilib.bkl
@@ -1,22 +1,22 @@
 <?xml version="1.0" ?>
+<!-- $Id$ -->
+
 <makefile>
     
     <!-- ================================================================= -->
     <!--                            wxBase library                         -->
     <!-- ================================================================= -->
     
-    <dll id="basedll" template="wx_dll"
+    <dll id="basedll" template="wx_base_dll"
          cond="SHARED=='1' and MONOLITHIC=='0'">
-        <define>WXMAKINGDLL</define>
-        <define>__WXBASE__</define> 
+        <define>WXMAKINGDLL_BASE</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"
+    <lib id="baselib" template="wx_base_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>
@@ -28,14 +28,16 @@
     
     <dll id="coredll" template="wx_dll"
          cond="SHARED=='1' and USE_GUI=='1' and MONOLITHIC=='0'">
-        <define>WXMAKINGDLL</define>
+        <define>WXUSINGDLL</define>
+        <define>WXMAKINGDLL_CORE</define>
+        <define>wxUSE_BASE=0</define> 
         <sources>$(BASE_AND_GUI_SRC) $(CORE_SRC)</sources>
-        
-        <wx-lib>base</wx-lib>
+        <library>basedll</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>
 
@@ -46,10 +48,11 @@
     
     <dll id="htmldll" template="wx_dll"
          cond="SHARED=='1' and USE_GUI=='1' and MONOLITHIC=='0'">
-        <define>WXMAKINGDLL</define>
+        <define>WXUSINGDLL</define>
+        <define>WXMAKINGDLL_HTML</define>
         <sources>$(HTML_SRC)</sources>
-        <wx-lib>core</wx-lib>
-        <wx-lib>base</wx-lib>
+        <library>coredll</library>
+        <library>basedll</library>
     </dll>
     
     <lib id="htmllib" template="wx_lib"