From fdec2f7d51e8296af2756251ebb12c4998887971 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Mon, 25 Aug 2003 21:01:05 +0000 Subject: [PATCH 1/1] 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 --- contrib/build/animate/animate.bkl | 2 +- contrib/build/animate/animate.dsw | 33 ---------- contrib/build/deprecated/deprecated.bkl | 2 +- contrib/build/deprecated/deprecated.dsw | 33 ---------- contrib/build/fl/fl.bkl | 2 +- contrib/build/fl/fl.dsw | 33 ---------- contrib/build/gizmos/gizmos.bkl | 2 +- contrib/build/gizmos/gizmos.dsw | 33 ---------- contrib/build/mmedia/mmedia.bkl | 2 +- contrib/build/mmedia/mmedia.dsw | 33 ---------- contrib/build/net/netutils.bkl | 2 +- contrib/build/net/netutils.dsw | 33 ---------- contrib/build/ogl/ogl.bkl | 2 +- contrib/build/ogl/ogl.dsw | 33 ---------- contrib/build/plot/plot.bkl | 2 +- contrib/build/plot/plot.dsw | 33 ---------- contrib/build/stc/stc.bkl | 2 +- contrib/build/stc/stc.dsw | 33 ---------- contrib/build/svg/svg.bkl | 2 +- contrib/build/svg/svg.dsw | 33 ---------- contrib/build/xrc/xrc.bkl | 2 +- contrib/build/xrc/xrc.dsw | 87 ------------------------- 22 files changed, 11 insertions(+), 428 deletions(-) diff --git a/contrib/build/animate/animate.bkl b/contrib/build/animate/animate.bkl index 09a802a0dc..aa4e51a37d 100644 --- a/contrib/build/animate/animate.bkl +++ b/contrib/build/animate/animate.bkl @@ -27,6 +27,6 @@ $(ANIMATE_SRC) - animate=animatedll+animatelib + animate=animatelib+animatedll diff --git a/contrib/build/animate/animate.dsw b/contrib/build/animate/animate.dsw index 4d91013e9a..0ec1375d1e 100644 --- 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! ############################################################################### -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> @@ -37,12 +10,6 @@ Package=<5> 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 5b3fd85991..eac0cda1d8 100644 --- a/contrib/build/deprecated/deprecated.bkl +++ b/contrib/build/deprecated/deprecated.bkl @@ -49,7 +49,7 @@ $(DEPRECATED_SRC) - deprecated=deprecateddll+deprecatedlib + deprecated=deprecatedlib+deprecateddll diff --git a/contrib/build/deprecated/deprecated.dsw b/contrib/build/deprecated/deprecated.dsw index 6aee33c8d6..69b4fe9eb1 100644 --- 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! ############################################################################### -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> @@ -37,12 +10,6 @@ Package=<5> 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 aaf5076d29..9504cd959b 100644 --- a/contrib/build/fl/fl.bkl +++ b/contrib/build/fl/fl.bkl @@ -61,7 +61,7 @@ $(FL_SRC) - fl=fldll+fllib + fl=fllib+fldll diff --git a/contrib/build/fl/fl.dsw b/contrib/build/fl/fl.dsw index dfe257be33..1eeadeeea1 100644 --- 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! ############################################################################### -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> @@ -37,12 +10,6 @@ Package=<5> 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 65226aea98..90752612bd 100644 --- a/contrib/build/gizmos/gizmos.bkl +++ b/contrib/build/gizmos/gizmos.bkl @@ -38,6 +38,6 @@ $(GIZMOS_SRC) - gizmos=gizmosdll+gizmoslib + gizmos=gizmoslib+gizmosdll diff --git a/contrib/build/gizmos/gizmos.dsw b/contrib/build/gizmos/gizmos.dsw index 1bb5e56a1e..43c56eb763 100644 --- 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! ############################################################################### -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> @@ -37,12 +10,6 @@ Package=<5> 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 da2990e00c..f14f68ce9c 100644 --- a/contrib/build/mmedia/mmedia.bkl +++ b/contrib/build/mmedia/mmedia.bkl @@ -85,7 +85,7 @@ $(MMEDIA_SRC) - mmedia=mmediadll+mmedialib + mmedia=mmedialib+mmediadll diff --git a/contrib/build/mmedia/mmedia.dsw b/contrib/build/mmedia/mmedia.dsw index bffc120d86..b25e9807ce 100644 --- 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! ############################################################################### -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> @@ -37,12 +10,6 @@ Package=<5> 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 861def5b3a..ba4e545d18 100644 --- a/contrib/build/net/netutils.bkl +++ b/contrib/build/net/netutils.bkl @@ -32,6 +32,6 @@ $(NETUTILS_SRC) - netutils=netutilsdll+netutilslib + netutils=netutilslib+netutilsdll diff --git a/contrib/build/net/netutils.dsw b/contrib/build/net/netutils.dsw index fc8ecfea47..1052235b93 100644 --- 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! ############################################################################### -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> @@ -37,12 +10,6 @@ Package=<5> 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 d104cdec79..44aa5e89c2 100644 --- a/contrib/build/ogl/ogl.bkl +++ b/contrib/build/ogl/ogl.bkl @@ -52,6 +52,6 @@ $(OGL_SRC) - ogl=ogldll+ogllib + ogl=ogllib+ogldll diff --git a/contrib/build/ogl/ogl.dsw b/contrib/build/ogl/ogl.dsw index 66ef09b388..bb71f75d5f 100644 --- 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! ############################################################################### -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> @@ -37,12 +10,6 @@ Package=<5> 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 a286d13f3a..05d778e403 100644 --- a/contrib/build/plot/plot.bkl +++ b/contrib/build/plot/plot.bkl @@ -34,6 +34,6 @@ $(PLOT_SRC) - plot=plotdll+plotlib + plot=plotlib+plotdll diff --git a/contrib/build/plot/plot.dsw b/contrib/build/plot/plot.dsw index 249ab31fef..39529fbfaa 100644 --- 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! ############################################################################### -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> @@ -37,12 +10,6 @@ Package=<5> 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 c03d07d413..083152732a 100644 --- a/contrib/build/stc/stc.bkl +++ b/contrib/build/stc/stc.bkl @@ -84,6 +84,6 @@ - stc=stcdll+stclib + stc=stclib+stcdll diff --git a/contrib/build/stc/stc.dsw b/contrib/build/stc/stc.dsw index 3c382f640c..38bdfac798 100644 --- 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! ############################################################################### -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> @@ -37,12 +10,6 @@ Package=<5> 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 b9ad317e19..bf77566f4e 100644 --- a/contrib/build/svg/svg.bkl +++ b/contrib/build/svg/svg.bkl @@ -27,6 +27,6 @@ $(SVG_SRC) - svg=svgdll+svglib + svg=svglib+svgdll diff --git a/contrib/build/svg/svg.dsw b/contrib/build/svg/svg.dsw index dadc88aaa5..a809c47b61 100644 --- 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! ############################################################################### -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> @@ -37,12 +10,6 @@ Package=<5> 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 55fb8f6b0d..3a6f12564e 100644 --- a/contrib/build/xrc/xrc.bkl +++ b/contrib/build/xrc/xrc.bkl @@ -106,6 +106,6 @@ $(XRC_SRC) - xrc=xrcdll+xrclib + xrc=xrclib+xrcdll diff --git a/contrib/build/xrc/xrc.dsw b/contrib/build/xrc/xrc.dsw index e4eb91c9f0..838c4bba3e 100644 --- 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! ############################################################################### -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> @@ -82,21 +10,6 @@ Package=<5> 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 }}} ############################################################################### -- 2.45.2