removed dependencies from VC++ projects, they break static libs

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

diff --git a/contrib/build/animate/animate.bkl b/contrib/build/animate/animate.bkl
index 09a802a0dc107076c264e3368f2f15b9deff0f42..aa4e51a37ddfcec827fe94a25d66064110289e8e 100644 (file)
--- a/contrib/build/animate/animate.bkl
+++ b/contrib/build/animate/animate.bkl
@@ -27,6 +27,6 @@
         <sources>$(ANIMATE_SRC)</sources>
     </lib>
 
         <sources>$(ANIMATE_SRC)</sources>
     </lib>
 

-    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">animate=animatedll+animatelib</set>
+    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">animate=animatelib+animatedll</set>

 
 </makefile>
 
 </makefile>

diff --git a/contrib/build/animate/animate.dsw b/contrib/build/animate/animate.dsw
index 4d91013e9a22e48f040757c04ab315573e060614..0ec1375d1e8408fadc8b3960497e8fb3b88f0df2 100644 (file)
--- a/contrib/build/animate/animate.dsw
+++ b/contrib/build/animate/animate.dsw
@@ -2,33 +2,6 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
 
 ###############################################################################
 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
 
 ###############################################################################

-Project: "core"=..\..\..\build\msw\wx_core.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-Begin Project Dependency
-Project_Dep_Name base
-End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "base"=..\..\..\build\msw\wx_base.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-

 Project: "animate"=animate.dsp - Package Owner=<4>
 
 Package=<5>
 Project: "animate"=animate.dsp - Package Owner=<4>
 
 Package=<5>


@@ -37,12 +10,6 @@ Package=<5>
 
 Package=<4>
 {{{
 
 Package=<4>
 {{{

-Begin Project Dependency
-Project_Dep_Name core
-End Project Dependency
-Begin Project Dependency
-Project_Dep_Name base
-End Project Dependency

 }}}
 
 ###############################################################################
 }}}
 
 ###############################################################################

diff --git a/contrib/build/deprecated/deprecated.bkl b/contrib/build/deprecated/deprecated.bkl
index 5b3fd85991655e00dc6fbd7543728b7957f2e87f..eac0cda1d88aa333ff78eb7a0dd173d7e305fb2f 100644 (file)
--- a/contrib/build/deprecated/deprecated.bkl
+++ b/contrib/build/deprecated/deprecated.bkl
@@ -49,7 +49,7 @@
         <sources>$(DEPRECATED_SRC)</sources>
     </lib>
     
         <sources>$(DEPRECATED_SRC)</sources>
     </lib>
     

-    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">deprecated=deprecateddll+deprecatedlib</set>
+    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">deprecated=deprecatedlib+deprecateddll</set>

 
 </makefile>
 
 
 </makefile>
 

diff --git a/contrib/build/deprecated/deprecated.dsw b/contrib/build/deprecated/deprecated.dsw
index 6aee33c8d68940a7970aa72049475eba8dda3e43..69b4fe9eb166ec4ca8aaa6c3dca55da32a0f2d53 100644 (file)
--- a/contrib/build/deprecated/deprecated.dsw
+++ b/contrib/build/deprecated/deprecated.dsw
@@ -2,33 +2,6 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
 
 ###############################################################################
 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
 
 ###############################################################################

-Project: "core"=..\..\..\build\msw\wx_core.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-Begin Project Dependency
-Project_Dep_Name base
-End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "base"=..\..\..\build\msw\wx_base.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-

 Project: "deprecated"=deprecated.dsp - Package Owner=<4>
 
 Package=<5>
 Project: "deprecated"=deprecated.dsp - Package Owner=<4>
 
 Package=<5>


@@ -37,12 +10,6 @@ Package=<5>
 
 Package=<4>
 {{{
 
 Package=<4>
 {{{

-Begin Project Dependency
-Project_Dep_Name core
-End Project Dependency
-Begin Project Dependency
-Project_Dep_Name base
-End Project Dependency

 }}}
 
 ###############################################################################
 }}}
 
 ###############################################################################

diff --git a/contrib/build/fl/fl.bkl b/contrib/build/fl/fl.bkl
index aaf5076d2997d4e82cbc45b8e9e12d289eb1316a..9504cd959baf5f75077badde6ca34e51e084111f 100644 (file)
--- a/contrib/build/fl/fl.bkl
+++ b/contrib/build/fl/fl.bkl
@@ -61,7 +61,7 @@
         <sources>$(FL_SRC)</sources>
     </lib>
 
         <sources>$(FL_SRC)</sources>
     </lib>
 

-    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">fl=fldll+fllib</set>
+    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">fl=fllib+fldll</set>

 
 </makefile>
 
 
 </makefile>
 

diff --git a/contrib/build/fl/fl.dsw b/contrib/build/fl/fl.dsw
index dfe257be333629e6214676781a2a0d15f6e198e8..1eeadeeea1b8330189c40d72bf9c2534160b4f40 100644 (file)
--- a/contrib/build/fl/fl.dsw
+++ b/contrib/build/fl/fl.dsw
@@ -2,33 +2,6 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
 
 ###############################################################################
 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
 
 ###############################################################################

-Project: "core"=..\..\..\build\msw\wx_core.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-Begin Project Dependency
-Project_Dep_Name base
-End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "base"=..\..\..\build\msw\wx_base.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-

 Project: "fl"=fl.dsp - Package Owner=<4>
 
 Package=<5>
 Project: "fl"=fl.dsp - Package Owner=<4>
 
 Package=<5>


@@ -37,12 +10,6 @@ Package=<5>
 
 Package=<4>
 {{{
 
 Package=<4>
 {{{

-Begin Project Dependency
-Project_Dep_Name core
-End Project Dependency
-Begin Project Dependency
-Project_Dep_Name base
-End Project Dependency

 }}}
 
 ###############################################################################
 }}}
 
 ###############################################################################

diff --git a/contrib/build/gizmos/gizmos.bkl b/contrib/build/gizmos/gizmos.bkl
index 65226aea9863d00efe4529ad6da2228aef22348c..90752612bd2314d070f889dfeb983566229563cb 100644 (file)
--- a/contrib/build/gizmos/gizmos.bkl
+++ b/contrib/build/gizmos/gizmos.bkl
@@ -38,6 +38,6 @@
         <sources>$(GIZMOS_SRC)</sources>
     </lib>
     
         <sources>$(GIZMOS_SRC)</sources>
     </lib>
     

-    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">gizmos=gizmosdll+gizmoslib</set>
+    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">gizmos=gizmoslib+gizmosdll</set>

 
 </makefile>
 
 </makefile>

diff --git a/contrib/build/gizmos/gizmos.dsw b/contrib/build/gizmos/gizmos.dsw
index 1bb5e56a1e853f01c17d95bc62cff4b2b074841e..43c56eb763cb0b350b2850a574a59e5c3bf51bcc 100644 (file)
--- a/contrib/build/gizmos/gizmos.dsw
+++ b/contrib/build/gizmos/gizmos.dsw
@@ -2,33 +2,6 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
 
 ###############################################################################
 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
 
 ###############################################################################

-Project: "base"=..\..\..\build\msw\wx_base.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "core"=..\..\..\build\msw\wx_core.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-Begin Project Dependency
-Project_Dep_Name base
-End Project Dependency
-}}}
-
-###############################################################################
-

 Project: "gizmos"=gizmos.dsp - Package Owner=<4>
 
 Package=<5>
 Project: "gizmos"=gizmos.dsp - Package Owner=<4>
 
 Package=<5>


@@ -37,12 +10,6 @@ Package=<5>
 
 Package=<4>
 {{{
 
 Package=<4>
 {{{

-Begin Project Dependency
-Project_Dep_Name base
-End Project Dependency
-Begin Project Dependency
-Project_Dep_Name core
-End Project Dependency

 }}}
 
 ###############################################################################
 }}}
 
 ###############################################################################

diff --git a/contrib/build/mmedia/mmedia.bkl b/contrib/build/mmedia/mmedia.bkl
index da2990e00c34630b5c15d443b93e58c44d32cd28..f14f68ce9c216309429ca29a261846baacee504e 100644 (file)
--- a/contrib/build/mmedia/mmedia.bkl
+++ b/contrib/build/mmedia/mmedia.bkl
@@ -85,7 +85,7 @@
         <sources>$(MMEDIA_SRC)</sources>
     </lib>
     
         <sources>$(MMEDIA_SRC)</sources>
     </lib>
     

-    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">mmedia=mmediadll+mmedialib</set>
+    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">mmedia=mmedialib+mmediadll</set>

 
 </makefile>
 
 
 </makefile>
 

diff --git a/contrib/build/mmedia/mmedia.dsw b/contrib/build/mmedia/mmedia.dsw
index bffc120d86f078ab9a47d89bb316f511c911c609..b25e9807ce1a884922765c0ee8b24587163b8310 100644 (file)
--- a/contrib/build/mmedia/mmedia.dsw
+++ b/contrib/build/mmedia/mmedia.dsw
@@ -2,33 +2,6 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
 
 ###############################################################################
 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
 
 ###############################################################################

-Project: "core"=..\..\..\build\msw\wx_core.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-Begin Project Dependency
-Project_Dep_Name base
-End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "base"=..\..\..\build\msw\wx_base.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-

 Project: "mmedia"=mmedia.dsp - Package Owner=<4>
 
 Package=<5>
 Project: "mmedia"=mmedia.dsp - Package Owner=<4>
 
 Package=<5>


@@ -37,12 +10,6 @@ Package=<5>
 
 Package=<4>
 {{{
 
 Package=<4>
 {{{

-Begin Project Dependency
-Project_Dep_Name core
-End Project Dependency
-Begin Project Dependency
-Project_Dep_Name base
-End Project Dependency

 }}}
 
 ###############################################################################
 }}}
 
 ###############################################################################

diff --git a/contrib/build/net/netutils.bkl b/contrib/build/net/netutils.bkl
index 861def5b3a443e9c2dbdd318187fa5ad005dab97..ba4e545d18ddc250b475bf6e2cb6513d36f2f695 100644 (file)
--- a/contrib/build/net/netutils.bkl
+++ b/contrib/build/net/netutils.bkl
@@ -32,6 +32,6 @@
         <sources>$(NETUTILS_SRC)</sources>
     </lib>
     
         <sources>$(NETUTILS_SRC)</sources>
     </lib>
     

-    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">netutils=netutilsdll+netutilslib</set>
+    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">netutils=netutilslib+netutilsdll</set>

 
 </makefile>
 
 </makefile>

diff --git a/contrib/build/net/netutils.dsw b/contrib/build/net/netutils.dsw
index fc8ecfea4748e2f227ceb3611d2734fe1898d561..1052235b93c5b7e5a067da38792b62bd45405009 100644 (file)
--- a/contrib/build/net/netutils.dsw
+++ b/contrib/build/net/netutils.dsw
@@ -2,33 +2,6 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
 
 ###############################################################################
 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
 
 ###############################################################################

-Project: "core"=..\..\..\build\msw\wx_core.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-Begin Project Dependency
-Project_Dep_Name base
-End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "base"=..\..\..\build\msw\wx_base.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-

 Project: "netutils"=netutils.dsp - Package Owner=<4>
 
 Package=<5>
 Project: "netutils"=netutils.dsp - Package Owner=<4>
 
 Package=<5>


@@ -37,12 +10,6 @@ Package=<5>
 
 Package=<4>
 {{{
 
 Package=<4>
 {{{

-Begin Project Dependency
-Project_Dep_Name core
-End Project Dependency
-Begin Project Dependency
-Project_Dep_Name base
-End Project Dependency

 }}}
 
 ###############################################################################
 }}}
 
 ###############################################################################

diff --git a/contrib/build/ogl/ogl.bkl b/contrib/build/ogl/ogl.bkl
index d104cdec79ad2a296084521cbf7c150ad717ed5f..44aa5e89c2ea037eeabcba9fba2936fcc82b1511 100644 (file)
--- a/contrib/build/ogl/ogl.bkl
+++ b/contrib/build/ogl/ogl.bkl
@@ -52,6 +52,6 @@
         <sources>$(OGL_SRC)</sources>
     </lib>
     
         <sources>$(OGL_SRC)</sources>
     </lib>
     

-    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">ogl=ogldll+ogllib</set>
+    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">ogl=ogllib+ogldll</set>

 
 </makefile>
 
 </makefile>

diff --git a/contrib/build/ogl/ogl.dsw b/contrib/build/ogl/ogl.dsw
index 66ef09b388de8bae382f4a317ffcd150a6feb5e5..bb71f75d5f5e496dcecdbc7e6147b65eb8b32011 100644 (file)
--- a/contrib/build/ogl/ogl.dsw
+++ b/contrib/build/ogl/ogl.dsw
@@ -2,33 +2,6 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
 
 ###############################################################################
 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
 
 ###############################################################################

-Project: "core"=..\..\..\build\msw\wx_core.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-Begin Project Dependency
-Project_Dep_Name base
-End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "base"=..\..\..\build\msw\wx_base.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-

 Project: "ogl"=ogl.dsp - Package Owner=<4>
 
 Package=<5>
 Project: "ogl"=ogl.dsp - Package Owner=<4>
 
 Package=<5>


@@ -37,12 +10,6 @@ Package=<5>
 
 Package=<4>
 {{{
 
 Package=<4>
 {{{

-Begin Project Dependency
-Project_Dep_Name core
-End Project Dependency
-Begin Project Dependency
-Project_Dep_Name base
-End Project Dependency

 }}}
 
 ###############################################################################
 }}}
 
 ###############################################################################

diff --git a/contrib/build/plot/plot.bkl b/contrib/build/plot/plot.bkl
index a286d13f3a4459c190514a64bdb18cde970dbf3c..05d778e40396402520dec1ea1999630c67a06788 100644 (file)
--- a/contrib/build/plot/plot.bkl
+++ b/contrib/build/plot/plot.bkl
@@ -34,6 +34,6 @@
         <sources>$(PLOT_SRC)</sources>
     </lib>
     
         <sources>$(PLOT_SRC)</sources>
     </lib>
     

-    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">plot=plotdll+plotlib</set>
+    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">plot=plotlib+plotdll</set>

 
 </makefile>
 
 </makefile>

diff --git a/contrib/build/plot/plot.dsw b/contrib/build/plot/plot.dsw
index 249ab31fef532fd6b1c2a73908e845e0838532c5..39529fbfaa7b619845116f7f3cf26995b58e7b59 100644 (file)
--- a/contrib/build/plot/plot.dsw
+++ b/contrib/build/plot/plot.dsw
@@ -2,33 +2,6 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
 
 ###############################################################################
 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
 
 ###############################################################################

-Project: "core"=..\..\..\build\msw\wx_core.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-Begin Project Dependency
-Project_Dep_Name base
-End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "base"=..\..\..\build\msw\wx_base.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-

 Project: "plot"=plot.dsp - Package Owner=<4>
 
 Package=<5>
 Project: "plot"=plot.dsp - Package Owner=<4>
 
 Package=<5>


@@ -37,12 +10,6 @@ Package=<5>
 
 Package=<4>
 {{{
 
 Package=<4>
 {{{

-Begin Project Dependency
-Project_Dep_Name core
-End Project Dependency
-Begin Project Dependency
-Project_Dep_Name base
-End Project Dependency

 }}}
 
 ###############################################################################
 }}}
 
 ###############################################################################

diff --git a/contrib/build/stc/stc.bkl b/contrib/build/stc/stc.bkl
index c03d07d41379dff754cf4fd0c36768f7a60896e1..083152732a7bb7ee43253cecc6146b8b376a896a 100644 (file)
--- a/contrib/build/stc/stc.bkl
+++ b/contrib/build/stc/stc.bkl
@@ -84,6 +84,6 @@
 
     <lib id="stclib" template="wx_contrib_lib,stc_base" cond="SHARED=='0'"/>
     
 
     <lib id="stclib" template="wx_contrib_lib,stc_base" cond="SHARED=='0'"/>
     

-    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">stc=stcdll+stclib</set>
+    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">stc=stclib+stcdll</set>

 
 </makefile>
 
 </makefile>

diff --git a/contrib/build/stc/stc.dsw b/contrib/build/stc/stc.dsw
index 3c382f640c4a2b75119f8e0728a89fb00ae7c952..38bdfac798cd03756ef11ff07171772f2cf48fab 100644 (file)
--- a/contrib/build/stc/stc.dsw
+++ b/contrib/build/stc/stc.dsw
@@ -2,33 +2,6 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
 
 ###############################################################################
 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
 
 ###############################################################################

-Project: "core"=..\..\..\build\msw\wx_core.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-Begin Project Dependency
-Project_Dep_Name base
-End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "base"=..\..\..\build\msw\wx_base.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-

 Project: "stc"=stc.dsp - Package Owner=<4>
 
 Package=<5>
 Project: "stc"=stc.dsp - Package Owner=<4>
 
 Package=<5>


@@ -37,12 +10,6 @@ Package=<5>
 
 Package=<4>
 {{{
 
 Package=<4>
 {{{

-Begin Project Dependency
-Project_Dep_Name core
-End Project Dependency
-Begin Project Dependency
-Project_Dep_Name base
-End Project Dependency

 }}}
 
 ###############################################################################
 }}}
 
 ###############################################################################

diff --git a/contrib/build/svg/svg.bkl b/contrib/build/svg/svg.bkl
index b9ad317e19410f133a66ab0cc35695d744c5fbbe..bf77566f4ed1d9c8df46d8631dd57c2a1130a12f 100644 (file)
--- a/contrib/build/svg/svg.bkl
+++ b/contrib/build/svg/svg.bkl
@@ -27,6 +27,6 @@
         <sources>$(SVG_SRC)</sources>
     </lib>
     
         <sources>$(SVG_SRC)</sources>
     </lib>
     

-    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">svg=svgdll+svglib</set>
+    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">svg=svglib+svgdll</set>

 
 </makefile>
 
 </makefile>

diff --git a/contrib/build/svg/svg.dsw b/contrib/build/svg/svg.dsw
index dadc88aaa530f5f30fc138aaa64d137b841f70c0..a809c47b6195e4f0bb36c2f41f73519f554ab179 100644 (file)
--- a/contrib/build/svg/svg.dsw
+++ b/contrib/build/svg/svg.dsw
@@ -2,33 +2,6 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
 
 ###############################################################################
 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
 
 ###############################################################################

-Project: "core"=..\..\..\build\msw\wx_core.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-Begin Project Dependency
-Project_Dep_Name base
-End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "base"=..\..\..\build\msw\wx_base.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-

 Project: "svg"=svg.dsp - Package Owner=<4>
 
 Package=<5>
 Project: "svg"=svg.dsp - Package Owner=<4>
 
 Package=<5>


@@ -37,12 +10,6 @@ Package=<5>
 
 Package=<4>
 {{{
 
 Package=<4>
 {{{

-Begin Project Dependency
-Project_Dep_Name core
-End Project Dependency
-Begin Project Dependency
-Project_Dep_Name base
-End Project Dependency

 }}}
 
 ###############################################################################
 }}}
 
 ###############################################################################

diff --git a/contrib/build/xrc/xrc.bkl b/contrib/build/xrc/xrc.bkl
index 55fb8f6b0d0144f0a59546bc90209f42d605e42e..3a6f12564eff7a62c40d0a911375008b49f343d8 100644 (file)
--- a/contrib/build/xrc/xrc.bkl
+++ b/contrib/build/xrc/xrc.bkl
@@ -106,6 +106,6 @@
         <sources>$(XRC_SRC)</sources>
     </lib>
     
         <sources>$(XRC_SRC)</sources>
     </lib>
     

-    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">xrc=xrcdll+xrclib</set>
+    <set var="MSVC6PRJ_MERGED_TARGETS" append="1">xrc=xrclib+xrcdll</set>

 
 </makefile>
 
 </makefile>

diff --git a/contrib/build/xrc/xrc.dsw b/contrib/build/xrc/xrc.dsw
index e4eb91c9f082c973b3b911d1b98365f365407ce7..838c4bba3e1834dca56938aa8d6036475631ff2a 100644 (file)
--- a/contrib/build/xrc/xrc.dsw
+++ b/contrib/build/xrc/xrc.dsw
@@ -2,78 +2,6 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
 
 ###############################################################################
 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
 
 ###############################################################################

-Project: "html"=..\..\..\build\msw\wx_html.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-Begin Project Dependency
-Project_Dep_Name core
-End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "adv"=..\..\..\build\msw\wx_adv.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-Begin Project Dependency
-Project_Dep_Name core
-End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "core"=..\..\..\build\msw\wx_core.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-Begin Project Dependency
-Project_Dep_Name base
-End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "xml"=..\..\..\build\msw\wx_xml.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-Begin Project Dependency
-Project_Dep_Name base
-End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "base"=..\..\..\build\msw\wx_base.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-

 Project: "xrc"=xrc.dsp - Package Owner=<4>
 
 Package=<5>
 Project: "xrc"=xrc.dsp - Package Owner=<4>
 
 Package=<5>


@@ -82,21 +10,6 @@ Package=<5>
 
 Package=<4>
 {{{
 
 Package=<4>
 {{{

-Begin Project Dependency
-Project_Dep_Name html
-End Project Dependency
-Begin Project Dependency
-Project_Dep_Name adv
-End Project Dependency
-Begin Project Dependency
-Project_Dep_Name core
-End Project Dependency
-Begin Project Dependency
-Project_Dep_Name xml
-End Project Dependency
-Begin Project Dependency
-Project_Dep_Name base
-End Project Dependency

 }}}
 
 ###############################################################################
 }}}
 
 ###############################################################################