X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3849327bce51993c5ac9db1278ce9d08f82af87e..0cf3b5429a5729a8ed1da31ea2c133861090018a:/build/bakefiles/multilib.bkl

diff --git a/build/bakefiles/multilib.bkl b/build/bakefiles/multilib.bkl
index 9f1a033d26..d41d4500b4 100644
--- a/build/bakefiles/multilib.bkl
+++ b/build/bakefiles/multilib.bkl
@@ -95,6 +95,29 @@
     <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">adv=advlib+advdll</set>
     
     
+    <!-- ================================================================= -->
+    <!--                     wxMedia classes library                       -->
+    <!-- ================================================================= -->
+    
+    <dll id="mediadll" template="wx_dll"
+         cond="SHARED=='1' and USE_GUI=='1' and MONOLITHIC=='0'">
+        <define>WXUSINGDLL</define>
+        <define>WXMAKINGDLL_MEDIA</define>
+        <sources>$(MEDIA_SRC)</sources>
+        <msvc-headers>$(MEDIA_HDR)</msvc-headers>
+        <library>coredll</library>
+        <library>basedll</library>
+    </dll>
+    
+    <lib id="medialib" template="wx_lib"
+         cond="SHARED=='0' and USE_GUI=='1' and MONOLITHIC=='0'">
+        <sources>$(MEDIA_SRC)</sources>
+        <msvc-headers>$(MEDIA_HDR)</msvc-headers>
+    </lib>
+    
+    <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">media=medialib+mediadll</set>
+
+
     <!-- ================================================================= -->
     <!--                        DB classes library                         -->
     <!-- ================================================================= -->
@@ -143,7 +166,7 @@
     <!-- ================================================================ -->
     
     <dll id="htmldll" template="wx_dll"
-         cond="SHARED=='1' and USE_HTML=='1' and MONOLITHIC=='0'">
+         cond="SHARED=='1' and USE_GUI=='1' and USE_HTML=='1' and MONOLITHIC=='0'">
         <define>WXUSINGDLL</define>
         <define>WXMAKINGDLL_HTML</define>
         <sources>$(HTML_SRC)</sources>
@@ -154,7 +177,7 @@
     </dll>
     
     <lib id="htmllib" template="wx_lib"
-         cond="SHARED=='0' and USE_HTML=='1' and MONOLITHIC=='0'">
+         cond="SHARED=='0' and USE_GUI=='1' and USE_HTML=='1' and MONOLITHIC=='0'">
         <sources>$(HTML_SRC)</sources>
         <msvc-headers>$(HTML_HDR)</msvc-headers>
     </lib>