moved wxIcon implementation for ports where it's identical to wxBitmap to generic...

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

diff --git a/build/bakefiles/multilib.bkl b/build/bakefiles/multilib.bkl
index 991b011fddee9e1067ae8d3e791f01b3cc5531ee..cba2e42cfbdea723b7bdc230edd5bb7f06ad07ca 100644 (file)
--- a/build/bakefiles/multilib.bkl
+++ b/build/bakefiles/multilib.bkl
@@ -81,8 +81,6 @@
         <define>WXMAKINGDLL_ADV</define>
         <sources>$(ADVANCED_SRC) $(PLUGIN_ADV_SRC)</sources>
         <msvc-headers>$(ADVANCED_HDR)</msvc-headers>
         <define>WXMAKINGDLL_ADV</define>
         <sources>$(ADVANCED_SRC) $(PLUGIN_ADV_SRC)</sources>
         <msvc-headers>$(ADVANCED_HDR)</msvc-headers>

-        <library>htmldll</library>
-        <library>xmldll</library>

         <library>coredll</library>
         <library>basedll</library>
         <ldlibs>$(PLUGIN_ADV_EXTRALIBS)</ldlibs>
         <library>coredll</library>
         <library>basedll</library>
         <ldlibs>$(PLUGIN_ADV_EXTRALIBS)</ldlibs>


@@ -295,9 +293,11 @@
     <dll id="richtextdll" template="wx_dll"
          cond="SHARED=='1' and USE_RICHTEXT=='1' and MONOLITHIC=='0'">
         <define>WXUSINGDLL</define>
     <dll id="richtextdll" template="wx_dll"
          cond="SHARED=='1' and USE_RICHTEXT=='1' and MONOLITHIC=='0'">
         <define>WXUSINGDLL</define>

-        <define>WXMAKINGDLL_AUI</define>
+        <define>WXMAKINGDLL_RICHTEXT</define>

         <sources>$(RICHTEXT_SRC)</sources>
         <library>advdll</library>
         <sources>$(RICHTEXT_SRC)</sources>
         <library>advdll</library>

+        <library>htmldll</library>
+        <library>xmldll</library>

         <library>coredll</library>
         <library>basedll</library>
         <msvc-headers>$(RICHTEXT_HDR)</msvc-headers>
         <library>coredll</library>
         <library>basedll</library>
         <msvc-headers>$(RICHTEXT_HDR)</msvc-headers>