X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/61639efb6658a7a02dd8b0072c6e0bb4826ef654..a8c5e1a9d1f56190e2d87aadc40a75589585af1f:/build/bakefiles/multilib.bkl

diff --git a/build/bakefiles/multilib.bkl b/build/bakefiles/multilib.bkl
index c00deaffa7..cba2e42cfb 100644
--- a/build/bakefiles/multilib.bkl
+++ b/build/bakefiles/multilib.bkl
@@ -100,7 +100,7 @@
     <!-- ================================================================= -->
 
     <dll id="mediadll" template="wx_dll"
-         cond="SHARED=='1' and USE_GUI=='1' and MONOLITHIC=='0'">
+         cond="SHARED=='1' and USE_MEDIA=='1' and USE_GUI=='1' and MONOLITHIC=='0'">
         <define>WXUSINGDLL</define>
         <define>WXMAKINGDLL_MEDIA</define>
         <sources>$(MEDIA_SRC)</sources>
@@ -110,7 +110,7 @@
     </dll>
 
     <lib id="medialib" template="wx_lib"
-         cond="SHARED=='0' and USE_GUI=='1' and MONOLITHIC=='0'">
+         cond="SHARED=='0' and USE_MEDIA=='1' and USE_GUI=='1' and MONOLITHIC=='0'">
         <sources>$(MEDIA_SRC)</sources>
         <msvc-headers>$(MEDIA_HDR)</msvc-headers>
     </lib>
@@ -203,6 +203,7 @@
         <define>WXMAKINGDLL_QA</define>
         <sources>$(QA_SRC)</sources>
         <msvc-headers>$(QA_HDR)</msvc-headers>
+        <library>coredll</library>
         <library>basedll</library>
         <library>xmldll</library>
     </dll>
@@ -262,4 +263,52 @@
 
     <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">xrc=xrclib+xrcdll</set>
 
+    <!-- ================================================================ -->
+    <!--                            AUI                                   -->
+    <!-- ================================================================ -->
+
+    <dll id="auidll" template="wx_dll"
+         cond="SHARED=='1' and USE_AUI=='1' and MONOLITHIC=='0'">
+        <define>WXUSINGDLL</define>
+        <define>WXMAKINGDLL_AUI</define>
+        <sources>$(AUI_SRC)</sources>
+        <library>advdll</library>
+        <library>coredll</library>
+        <library>basedll</library>
+        <msvc-headers>$(AUI_HDR)</msvc-headers>
+    </dll>
+
+    <lib id="auilib" template="wx_lib"
+         cond="SHARED=='0' and USE_AUI=='1' and MONOLITHIC=='0'">
+        <sources>$(AUI_SRC)</sources>
+        <msvc-headers>$(AUI_HDR)</msvc-headers>
+    </lib>
+
+    <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">aui=auilib+auidll</set>
+
+    <!-- ================================================================ -->
+    <!--                            RICHTEXT                              -->
+    <!-- ================================================================ -->
+
+    <dll id="richtextdll" template="wx_dll"
+         cond="SHARED=='1' and USE_RICHTEXT=='1' and MONOLITHIC=='0'">
+        <define>WXUSINGDLL</define>
+        <define>WXMAKINGDLL_RICHTEXT</define>
+        <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>
+    </dll>
+
+    <lib id="richtextlib" template="wx_lib"
+         cond="SHARED=='0' and USE_RICHTEXT=='1' and MONOLITHIC=='0'">
+        <sources>$(RICHTEXT_SRC)</sources>
+        <msvc-headers>$(RICHTEXT_HDR)</msvc-headers>
+    </lib>
+
+    <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">richtext=richtextlib+richtextdll</set>
+
 </makefile>