be explicit about the version of SWIG to use

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

diff --git a/build/bakefiles/multilib.bkl b/build/bakefiles/multilib.bkl
index c8b2f0845f2d13baa1f0602e5fe5578e69f94607..0d5a8b962ad74c0a8d120b608f199e3bfeb07f1a 100644 (file)
--- 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>
         <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"
     </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>
         <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>
 
     </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>
     
         <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>
     
         <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,19 +79,20 @@
          cond="SHARED=='1' and USE_GUI=='1' and MONOLITHIC=='0'">
         <define>WXUSINGDLL</define>
         <define>WXMAKINGDLL_ADV</define>
          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>
         <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'">
     </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>
     
         <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>

     
     
     <!-- ================================================================= -->
     
     
     <!-- ================================================================= -->


@@ -135,8 +134,8 @@
         <msvc-headers>$(DBGRID_HDR)</msvc-headers>
     </lib>
     
         <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>

 
     
     <!-- ================================================================ -->
 
     
     <!-- ================================================================ -->


@@ -150,6 +149,7 @@
         <sources>$(HTML_SRC)</sources>
         <library>coredll</library>
         <library>basedll</library>
         <sources>$(HTML_SRC)</sources>
         <library>coredll</library>
         <library>basedll</library>

+        <ldlibs>$(EXTRALIBS_HTML)</ldlibs>

         <msvc-headers>$(HTML_HDR)</msvc-headers>
     </dll>
     
         <msvc-headers>$(HTML_HDR)</msvc-headers>
     </dll>
     


@@ -159,7 +159,7 @@
         <msvc-headers>$(HTML_HDR)</msvc-headers>
     </lib>
     
         <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                               -->
     
     <!-- ================================================================ -->
     <!--                             OpenGL                               -->


@@ -167,7 +167,7 @@
 
     <!-- included by wx.bkl from opengl.bkl -->
     
 
     <!-- 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 +190,6 @@
         <msvc-headers>$(XML_HDR)</msvc-headers>
     </lib>
     
         <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>
+    

 </makefile>
 </makefile>