VC++ project files dependencies

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22894 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/build/animate/animate.bkl b/contrib/build/animate/animate.bkl
index e2636342ebb95a19792872537428042b821f0802..09a802a0dc107076c264e3368f2f15b9deff0f42 100644 (file)
--- a/contrib/build/animate/animate.bkl
+++ b/contrib/build/animate/animate.bkl
@@ -27,4 +27,6 @@
         <sources>$(ANIMATE_SRC)</sources>
     </lib>
 
+    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">animate=animatedll+animatelib</set>
+
 </makefile>

diff --git a/contrib/build/deprecated/deprecated.bkl b/contrib/build/deprecated/deprecated.bkl
index 82afff29213ffca6054f329b953e98f4789c73b2..5eac70861274c47b4dd549148b0252cf6b44c11b 100644 (file)
--- a/contrib/build/deprecated/deprecated.bkl
+++ b/contrib/build/deprecated/deprecated.bkl
@@ -44,6 +44,8 @@
     <lib id="deprecatedlib" template="wx_contrib_lib" cond="SHARED=='0'">
         <sources>$(DEPRECATED_SRC)</sources>
     </lib>
+    
+    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">deprecated=deprecateddll+deprecatedlib</set>
 
 </makefile>
 

diff --git a/contrib/build/fl/fl.bkl b/contrib/build/fl/fl.bkl
index 3798d88b8873da247a6c2c1de91dcea4e96d3978..aaf5076d2997d4e82cbc45b8e9e12d289eb1316a 100644 (file)
--- a/contrib/build/fl/fl.bkl
+++ b/contrib/build/fl/fl.bkl
@@ -61,5 +61,7 @@
         <sources>$(FL_SRC)</sources>
     </lib>
 
+    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">fl=fldll+fllib</set>
+
 </makefile>
 

diff --git a/contrib/build/gizmos/gizmos.bkl b/contrib/build/gizmos/gizmos.bkl
index 06a65e942e2e0cea649828665f6320fa3876e6c4..65226aea9863d00efe4529ad6da2228aef22348c 100644 (file)
--- a/contrib/build/gizmos/gizmos.bkl
+++ b/contrib/build/gizmos/gizmos.bkl
@@ -37,5 +37,7 @@
     <lib id="gizmoslib" template="wx_contrib_lib" cond="SHARED=='0'">
         <sources>$(GIZMOS_SRC)</sources>
     </lib>
+    
+    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">gizmos=gizmosdll+gizmoslib</set>
 
 </makefile>

diff --git a/contrib/build/mmedia/mmedia.bkl b/contrib/build/mmedia/mmedia.bkl
index 67e5fb13a39868d807af9257e716bb5eae7e0e9c..da2990e00c34630b5c15d443b93e58c44d32cd28 100644 (file)
--- a/contrib/build/mmedia/mmedia.bkl
+++ b/contrib/build/mmedia/mmedia.bkl
@@ -84,6 +84,8 @@
     <lib id="mmedialib" template="wx_contrib_lib" cond="SHARED=='0'">
         <sources>$(MMEDIA_SRC)</sources>
     </lib>
+    
+    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">mmedia=mmediadll+mmedialib</set>
 
 </makefile>
 

diff --git a/contrib/build/net/netutils.bkl b/contrib/build/net/netutils.bkl
index 56c6a35112b01949c2aaa07e6d29f3c27f25f0ba..861def5b3a443e9c2dbdd318187fa5ad005dab97 100644 (file)
--- a/contrib/build/net/netutils.bkl
+++ b/contrib/build/net/netutils.bkl
@@ -31,5 +31,7 @@
     <lib id="netutilslib" template="wx_contrib_lib" cond="SHARED=='0'">
         <sources>$(NETUTILS_SRC)</sources>
     </lib>
+    
+    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">netutils=netutilsdll+netutilslib</set>
 
 </makefile>

diff --git a/contrib/build/ogl/ogl.bkl b/contrib/build/ogl/ogl.bkl
index 8d6cd5d8b739f4cb8959086298eea6cda5327238..d104cdec79ad2a296084521cbf7c150ad717ed5f 100644 (file)
--- a/contrib/build/ogl/ogl.bkl
+++ b/contrib/build/ogl/ogl.bkl
@@ -51,5 +51,7 @@
     <lib id="ogllib" template="wx_contrib_lib" cond="SHARED=='0'">
         <sources>$(OGL_SRC)</sources>
     </lib>
+    
+    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">ogl=ogldll+ogllib</set>
 
 </makefile>

diff --git a/contrib/build/plot/plot.bkl b/contrib/build/plot/plot.bkl
index 90b6d925f81ae2eb2a49f0615b7cb2b7e6e8dc9f..a286d13f3a4459c190514a64bdb18cde970dbf3c 100644 (file)
--- a/contrib/build/plot/plot.bkl
+++ b/contrib/build/plot/plot.bkl
@@ -33,5 +33,7 @@
     <lib id="plotlib" template="wx_contrib_lib" cond="SHARED=='0'">
         <sources>$(PLOT_SRC)</sources>
     </lib>
+    
+    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">plot=plotdll+plotlib</set>
 
 </makefile>

diff --git a/contrib/build/stc/stc.bkl b/contrib/build/stc/stc.bkl
index 517b5752e32c3af112e77da434bfe5560092a9ff..c03d07d41379dff754cf4fd0c36768f7a60896e1 100644 (file)
--- a/contrib/build/stc/stc.bkl
+++ b/contrib/build/stc/stc.bkl
@@ -83,5 +83,7 @@
     </dll>
 
     <lib id="stclib" template="wx_contrib_lib,stc_base" cond="SHARED=='0'"/>
+    
+    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">stc=stcdll+stclib</set>
 
 </makefile>

diff --git a/contrib/build/svg/svg.bkl b/contrib/build/svg/svg.bkl
index 374109b231251fc149bb52c000e7d1bf5449f7bf..b9ad317e19410f133a66ab0cc35695d744c5fbbe 100644 (file)
--- a/contrib/build/svg/svg.bkl
+++ b/contrib/build/svg/svg.bkl
@@ -26,5 +26,7 @@
     <lib id="svglib" template="wx_contrib_lib" cond="SHARED=='0'">
         <sources>$(SVG_SRC)</sources>
     </lib>
+    
+    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">svg=svgdll+svglib</set>
 
 </makefile>

diff --git a/contrib/build/xrc/xrc.bkl b/contrib/build/xrc/xrc.bkl
index 5ff99d792eec96027e28df1d5dc58124524d9095..55fb8f6b0d0144f0a59546bc90209f42d605e42e 100644 (file)
--- a/contrib/build/xrc/xrc.bkl
+++ b/contrib/build/xrc/xrc.bkl
@@ -105,5 +105,7 @@
         <include>$(SRCDIR)/expat/xmltok</include>
         <sources>$(XRC_SRC)</sources>
     </lib>
+    
+    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">xrc=xrcdll+xrclib</set>
 
 </makefile>