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

diff --git a/build/bakefiles/multilib.bkl b/build/bakefiles/multilib.bkl
index c8b2f0845f..d41d4500b4 100644
--- a/build/bakefiles/multilib.bkl
+++ b/build/bakefiles/multilib.bkl
@@ -13,7 +13,6 @@
         <define>wxUSE_BASE=1</define>
         <sources>$(BASE_SRC) $(BASE_AND_GUI_SRC)</sources>
         <msvc-headers>$(BASE_CMN_HDR) $(BASE_PLATFORM_HDR)</msvc-headers>
-        <msvc-copy-setup-h/>
     </dll>
     
     <lib id="baselib" template="wx_base_lib"
@@ -21,10 +20,9 @@
         <define>wxUSE_BASE=1</define> 
         <sources>$(BASE_SRC) $(BASE_AND_GUI_SRC)</sources>
         <msvc-headers>$(BASE_CMN_HDR) $(BASE_PLATFORM_HDR)</msvc-headers>
-        <msvc-copy-setup-h/>
     </lib>
 
-    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">base=baselib+basedll</set>
+    <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">base=baselib+basedll</set>
     
     
     <!-- ================================================================= -->
@@ -46,7 +44,7 @@
         <msvc-headers>$(NET_CMN_HDR) $(NET_PLATFORM_HDR)</msvc-headers>
     </lib>
     
-    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">net=netlib+netdll</set>
+    <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">net=netlib+netdll</set>
 
     
     <!-- ================================================================= -->
@@ -70,7 +68,7 @@
         <msvc-headers>$(ALL_GUI_HEADERS)</msvc-headers>
     </lib>
     
-    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">core=corelib+coredll</set>
+    <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">core=corelib+coredll</set>
     
     
     <!-- ================================================================= -->
@@ -81,21 +79,45 @@
          cond="SHARED=='1' and USE_GUI=='1' and MONOLITHIC=='0'">
         <define>WXUSINGDLL</define>
         <define>WXMAKINGDLL_ADV</define>
-        <sources>$(ADVANCED_SRC)</sources>
+        <sources>$(ADVANCED_SRC) $(PLUGIN_ADV_SRC)</sources>
         <msvc-headers>$(ADVANCED_HDR)</msvc-headers>
         <library>coredll</library>
         <library>basedll</library>
+        <ldlibs>$(PLUGIN_ADV_EXTRALIBS)</ldlibs>
     </dll>
     
     <lib id="advlib" template="wx_lib"
          cond="SHARED=='0' and USE_GUI=='1' and MONOLITHIC=='0'">
-        <sources>$(ADVANCED_SRC)</sources>
+        <sources>$(ADVANCED_SRC) $(PLUGIN_ADV_SRC)</sources>
         <msvc-headers>$(ADVANCED_HDR)</msvc-headers>
     </lib>
     
-    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">adv=advlib+advdll</set>
+    <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                         -->
     <!-- ================================================================= -->
@@ -135,8 +157,8 @@
         <msvc-headers>$(DBGRID_HDR)</msvc-headers>
     </lib>
     
-    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">odbc=odbclib+odbcdll</set>
-    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">dbgrid=dbgridlib+dbgriddll</set>
+    <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">odbc=odbclib+odbcdll</set>
+    <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">dbgrid=dbgridlib+dbgriddll</set>
 
     
     <!-- ================================================================ -->
@@ -144,22 +166,23 @@
     <!-- ================================================================ -->
     
     <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>
         <library>coredll</library>
         <library>basedll</library>
+        <ldlibs>$(EXTRALIBS_HTML)</ldlibs>
         <msvc-headers>$(HTML_HDR)</msvc-headers>
     </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>
     
-    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">html=htmllib+htmldll</set>
+    <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">html=htmllib+htmldll</set>
     
     <!-- ================================================================ -->
     <!--                             OpenGL                               -->
@@ -167,7 +190,7 @@
 
     <!-- included by wx.bkl from opengl.bkl -->
     
-    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">gl=gllib+gldll</set>
+    <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">gl=gllib+gldll</set>
     
     
     <!-- ================================================================ -->
@@ -190,6 +213,31 @@
         <msvc-headers>$(XML_HDR)</msvc-headers>
     </lib>
     
-    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">xml=xmllib+xmldll</set>
-
+    <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">xml=xmllib+xmldll</set>
+    
+    <!-- ================================================================ -->
+    <!--                            XRC                                   -->
+    <!-- ================================================================ -->
+    
+    <dll id="xrcdll" template="wx_dll"
+         cond="SHARED=='1' and USE_XRC=='1' and MONOLITHIC=='0'">
+        <define>WXUSINGDLL</define>
+        <define>WXMAKINGDLL_XRC</define>
+        <sources>$(XRC_SRC)</sources>
+        <library>htmldll</library>
+        <library>advdll</library>
+        <library>coredll</library>
+        <library>xmldll</library>
+        <library>basedll</library>
+        <msvc-headers>$(XRC_HDR)</msvc-headers>
+    </dll>
+    
+    <lib id="xrclib" template="wx_lib"
+         cond="SHARED=='0' and USE_XRC=='1' and MONOLITHIC=='0'">
+        <sources>$(XRC_SRC)</sources>
+        <msvc-headers>$(XRC_HDR)</msvc-headers>
+    </lib>
+    
+    <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">xrc=xrclib+xrcdll</set>
+    
 </makefile>