Don't link with media lib with USE_MEDIA==0.

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

diff --git a/build/bakefiles/multilib.bkl b/build/bakefiles/multilib.bkl
index c00deaffa7cfd9c6efed64711e10f7ea064c92f1..f2cef3f4243507d8776e88a6df550d6f433fd933 100644 (file)
--- a/build/bakefiles/multilib.bkl
+++ b/build/bakefiles/multilib.bkl
@@ -81,6 +81,8 @@
         <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>


@@ -100,7 +102,7 @@
     <!-- ================================================================= -->
 
     <dll id="mediadll" template="wx_dll"
     <!-- ================================================================= -->
 
     <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>
         <define>WXUSINGDLL</define>
         <define>WXMAKINGDLL_MEDIA</define>
         <sources>$(MEDIA_SRC)</sources>


@@ -110,7 +112,7 @@
     </dll>
 
     <lib id="medialib" template="wx_lib"
     </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>
         <sources>$(MEDIA_SRC)</sources>
         <msvc-headers>$(MEDIA_HDR)</msvc-headers>
     </lib>


@@ -203,6 +205,7 @@
         <define>WXMAKINGDLL_QA</define>
         <sources>$(QA_SRC)</sources>
         <msvc-headers>$(QA_HDR)</msvc-headers>
         <define>WXMAKINGDLL_QA</define>
         <sources>$(QA_SRC)</sources>
         <msvc-headers>$(QA_HDR)</msvc-headers>

+        <library>coredll</library>

         <library>basedll</library>
         <library>xmldll</library>
     </dll>
         <library>basedll</library>
         <library>xmldll</library>
     </dll>