Add <contrib-lib> bakefile tag. Like <wx-lib> except that in VC++ '.dsw' files

it creates a dependency on a '.dsp' file under contrib instead of under lib. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35151 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-08 13:08:45 +00:00 · 2005-08-08 13:08:45 +00:00 · 2edad6fc48
commit 2edad6fc48
parent 460354e939
44 changed files with 62 additions and 46 deletions
--- a/build/bakefiles/common_contrib.bkl
+++ b/build/bakefiles/common_contrib.bkl
@ -35,4 +35,16 @@
        <srcdir>$(CONTRIB_HDR_DIR)</srcdir>
        <install-to>$(INCLUDEDIR)/wx-$(WX_RELEASE)$(WX_FLAVOUR)</install-to>
    </template>
+
+    <!-- Link against one contrib library. Value must be literal! -->
+    <define-tag name="contrib-lib" rules="exe,dll,module">
+        <sys-lib>$(wxwin.libToLink(value))</sys-lib>
+        <ldlibs>$(wxwin.extraLdflags(value))</ldlibs>
+        <if cond="IS_MSVC_PRJ=='1' and MONOLITHIC=='0'">
+            <depends-on-dsp>
+                $(wxwin.makeContribDspDependency(value))
+            </depends-on-dsp>
+        </if>
+    </define-tag>
+
 </makefile>
--- a/build/bakefiles/wxwin.py
+++ b/build/bakefiles/wxwin.py
@ -151,3 +151,7 @@ def headersOnly(files):
 def makeDspDependency(lib):
    """Returns suitable entry for <depends-on-dsp> for main libs."""
    return '%s:$(nativePaths(WXTOPDIR))build\\msw\\wx_%s.dsp' % (lib,lib)
+
+def makeContribDspDependency(lib):
+    """Returns suitable entry for <depends-on-dsp> for contrib libs."""
+    return '%s:$(nativePaths(WXTOPDIR))contrib\\build\\%s\\%s.dsp' % (lib,lib,lib)
--- a/contrib/samples/animate/anitest.bkl
+++ b/contrib/samples/animate/anitest.bkl
@ -8,7 +8,7 @@
        <sources>
            anitest.cpp
        </sources>
-        <wx-lib>animate</wx-lib>
+        <contrib-lib>animate</contrib-lib>
        <wx-lib>core</wx-lib>
        <wx-lib>base</wx-lib>
        <win32-res>anitest.rc</win32-res>
--- a/contrib/samples/animate/anitest.dsw
+++ b/contrib/samples/animate/anitest.dsw
@ -23,7 +23,7 @@ End Project Dependency

 ###############################################################################

-Project: "animate"=..\..\build\animate\animate.dsp - Package Owner=<4>
+Project: "animate"=..\..\..\contrib\build\animate\animate.dsp - Package Owner=<4>

 Package=<5>
 {{{
--- a/contrib/samples/deprecated/proplist/proplist.bkl
+++ b/contrib/samples/deprecated/proplist/proplist.bkl
@ -8,7 +8,7 @@
        <sources>
            proplist.cpp
        </sources>
-        <wx-lib>deprecated</wx-lib>
+        <contrib-lib>deprecated</contrib-lib>
        <wx-lib>core</wx-lib>
        <wx-lib>base</wx-lib>
        <win32-res>proplist.rc</win32-res>
--- a/contrib/samples/deprecated/proplist/proplist.dsw
+++ b/contrib/samples/deprecated/proplist/proplist.dsw
@ -23,7 +23,7 @@ End Project Dependency

 ###############################################################################

-Project: "deprecated"=..\..\..\build\deprecated\deprecated.dsp - Package Owner=<4>
+Project: "deprecated"=..\..\..\..\contrib\build\deprecated\deprecated.dsp - Package Owner=<4>

 Package=<5>
 {{{
--- a/contrib/samples/deprecated/resource/resource.bkl
+++ b/contrib/samples/deprecated/resource/resource.bkl
@ -9,7 +9,7 @@
        <sources>
            resource.cpp
        </sources>
-        <wx-lib>deprecated</wx-lib>
+        <contrib-lib>deprecated</contrib-lib>
        <wx-lib>core</wx-lib>
        <wx-lib>base</wx-lib>
        <win32-res>resource.rc</win32-res>
--- a/contrib/samples/deprecated/resource/resource.dsw
+++ b/contrib/samples/deprecated/resource/resource.dsw
@ -23,7 +23,7 @@ End Project Dependency

 ###############################################################################

-Project: "deprecated"=..\..\..\build\deprecated\deprecated.dsp - Package Owner=<4>
+Project: "deprecated"=..\..\..\..\contrib\build\deprecated\deprecated.dsp - Package Owner=<4>

 Package=<5>
 {{{
--- a/contrib/samples/deprecated/treelay/treelay.bkl
+++ b/contrib/samples/deprecated/treelay/treelay.bkl
@ -9,7 +9,7 @@
        <sources>
            treelay.cpp
        </sources>
-        <wx-lib>deprecated</wx-lib>
+        <contrib-lib>deprecated</contrib-lib>
        <wx-lib>core</wx-lib>
        <wx-lib>base</wx-lib>
        <win32-res>treelay.rc</win32-res>
--- a/contrib/samples/deprecated/treelay/treelay.dsw
+++ b/contrib/samples/deprecated/treelay/treelay.dsw
@ -23,7 +23,7 @@ End Project Dependency

 ###############################################################################

-Project: "deprecated"=..\..\..\build\deprecated\deprecated.dsp - Package Owner=<4>
+Project: "deprecated"=..\..\..\..\contrib\build\deprecated\deprecated.dsp - Package Owner=<4>

 Package=<5>
 {{{
--- a/contrib/samples/fl/fl.bkl
+++ b/contrib/samples/fl/fl.bkl
@ -9,7 +9,7 @@
        <define>BMP_DIR="bitmaps/"</define>
        <sources>$(id).cpp</sources>
        <win32-res>$(id).rc</win32-res>
-        <wx-lib>fl</wx-lib>
+        <contrib-lib>fl</contrib-lib>
        <wx-lib>core</wx-lib>
        <wx-lib>base</wx-lib>
    </template>
--- a/contrib/samples/fl/fl.dsw
+++ b/contrib/samples/fl/fl.dsw
@ -107,7 +107,7 @@ End Project Dependency

 ###############################################################################

-Project: "fl"=..\..\build\fl\fl.dsp - Package Owner=<4>
+Project: "fl"=..\..\..\contrib\build\fl\fl.dsp - Package Owner=<4>

 Package=<5>
 {{{
--- a/contrib/samples/foldbar/extended/extended.bkl
+++ b/contrib/samples/foldbar/extended/extended.bkl
@ -8,7 +8,7 @@
        <sources>
            extended.cpp
        </sources>
-        <wx-lib>foldbar</wx-lib>
+        <contrib-lib>foldbar</contrib-lib>
        <wx-lib>adv</wx-lib>
        <wx-lib>core</wx-lib>
        <wx-lib>base</wx-lib>
--- a/contrib/samples/foldbar/extended/extended.dsw
+++ b/contrib/samples/foldbar/extended/extended.dsw
@ -26,7 +26,7 @@ End Project Dependency

 ###############################################################################

-Project: "foldbar"=..\..\..\build\foldbar\foldbar.dsp - Package Owner=<4>
+Project: "foldbar"=..\..\..\..\contrib\build\foldbar\foldbar.dsp - Package Owner=<4>

 Package=<5>
 {{{
--- a/contrib/samples/foldbar/foldpanelbar/foldtest.bkl
+++ b/contrib/samples/foldbar/foldpanelbar/foldtest.bkl
@ -11,7 +11,7 @@
            layouttest.cpp
            test.cpp
        </sources>
-        <wx-lib>foldbar</wx-lib>
+        <contrib-lib>foldbar</contrib-lib>
        <wx-lib>core</wx-lib>
        <wx-lib>base</wx-lib>
        <win32-res>foldpanelbartest.rc</win32-res>
--- a/contrib/samples/foldbar/foldpanelbar/foldtest.dsw
+++ b/contrib/samples/foldbar/foldpanelbar/foldtest.dsw
@ -23,7 +23,7 @@ End Project Dependency

 ###############################################################################

-Project: "foldbar"=..\..\..\build\foldbar\foldbar.dsp - Package Owner=<4>
+Project: "foldbar"=..\..\..\..\contrib\build\foldbar\foldbar.dsp - Package Owner=<4>

 Package=<5>
 {{{
--- a/contrib/samples/gizmos/dynsash/dynsash.bkl
+++ b/contrib/samples/gizmos/dynsash/dynsash.bkl
@ -8,7 +8,7 @@
        <sources>
            dynsash.cpp
        </sources>
-        <wx-lib>gizmos</wx-lib>
+        <contrib-lib>gizmos</contrib-lib>
        <wx-lib>html</wx-lib>
        <wx-lib>core</wx-lib>
        <wx-lib>base</wx-lib>
--- a/contrib/samples/gizmos/dynsash/dynsash.dsw
+++ b/contrib/samples/gizmos/dynsash/dynsash.dsw
@ -26,7 +26,7 @@ End Project Dependency

 ###############################################################################

-Project: "gizmos"=..\..\..\build\gizmos\gizmos.dsp - Package Owner=<4>
+Project: "gizmos"=..\..\..\..\contrib\build\gizmos\gizmos.dsp - Package Owner=<4>

 Package=<5>
 {{{
--- a/contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl
+++ b/contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl
@ -8,7 +8,7 @@
        <sources>
            dynsash_switch.cpp
        </sources>
-        <wx-lib>gizmos</wx-lib>
+        <contrib-lib>gizmos</contrib-lib>
        <wx-lib>core</wx-lib>
        <wx-lib>base</wx-lib>
    </exe>
--- a/contrib/samples/gizmos/dynsash_switch/dynsash_switch.dsw
+++ b/contrib/samples/gizmos/dynsash_switch/dynsash_switch.dsw
@ -23,7 +23,7 @@ End Project Dependency

 ###############################################################################

-Project: "gizmos"=..\..\..\build\gizmos\gizmos.dsp - Package Owner=<4>
+Project: "gizmos"=..\..\..\..\contrib\build\gizmos\gizmos.dsp - Package Owner=<4>

 Package=<5>
 {{{
--- a/contrib/samples/gizmos/editlbox/editlbox.bkl
+++ b/contrib/samples/gizmos/editlbox/editlbox.bkl
@ -8,7 +8,7 @@
        <sources>
            test.cpp
        </sources>
-        <wx-lib>gizmos</wx-lib>
+        <contrib-lib>gizmos</contrib-lib>
        <wx-lib>core</wx-lib>
        <wx-lib>base</wx-lib>
    </exe>
--- a/contrib/samples/gizmos/editlbox/editlbox.dsw
+++ b/contrib/samples/gizmos/editlbox/editlbox.dsw
@ -23,7 +23,7 @@ End Project Dependency

 ###############################################################################

-Project: "gizmos"=..\..\..\build\gizmos\gizmos.dsp - Package Owner=<4>
+Project: "gizmos"=..\..\..\..\contrib\build\gizmos\gizmos.dsp - Package Owner=<4>

 Package=<5>
 {{{
--- a/contrib/samples/gizmos/led/led.bkl
+++ b/contrib/samples/gizmos/led/led.bkl
@ -8,7 +8,7 @@
        <sources>
            led.cpp
        </sources>
-        <wx-lib>gizmos</wx-lib>
+        <contrib-lib>gizmos</contrib-lib>
        <wx-lib>core</wx-lib>
        <wx-lib>base</wx-lib>
    </exe>
--- a/contrib/samples/gizmos/led/led.dsw
+++ b/contrib/samples/gizmos/led/led.dsw
@ -23,7 +23,7 @@ End Project Dependency

 ###############################################################################

-Project: "gizmos"=..\..\..\build\gizmos\gizmos.dsp - Package Owner=<4>
+Project: "gizmos"=..\..\..\..\contrib\build\gizmos\gizmos.dsp - Package Owner=<4>

 Package=<5>
 {{{
--- a/contrib/samples/gizmos/multicell/multicell.bkl
+++ b/contrib/samples/gizmos/multicell/multicell.bkl
@ -8,7 +8,7 @@
        <sources>
            mtest.cpp
        </sources>
-        <wx-lib>gizmos</wx-lib>
+        <contrib-lib>gizmos</contrib-lib>
        <wx-lib>core</wx-lib>
        <wx-lib>base</wx-lib>
    </exe>
--- a/contrib/samples/gizmos/multicell/multicell.dsw
+++ b/contrib/samples/gizmos/multicell/multicell.dsw
@ -23,7 +23,7 @@ End Project Dependency

 ###############################################################################

-Project: "gizmos"=..\..\..\build\gizmos\gizmos.dsp - Package Owner=<4>
+Project: "gizmos"=..\..\..\..\contrib\build\gizmos\gizmos.dsp - Package Owner=<4>

 Package=<5>
 {{{
--- a/contrib/samples/gizmos/splittree/splittree.bkl
+++ b/contrib/samples/gizmos/splittree/splittree.bkl
@ -8,7 +8,7 @@
        <sources>
            tree.cpp
        </sources>
-        <wx-lib>gizmos</wx-lib>
+        <contrib-lib>gizmos</contrib-lib>
        <wx-lib>core</wx-lib>
        <wx-lib>base</wx-lib>
    </exe>
--- a/contrib/samples/gizmos/splittree/splittree.dsw
+++ b/contrib/samples/gizmos/splittree/splittree.dsw
@ -23,7 +23,7 @@ End Project Dependency

 ###############################################################################

-Project: "gizmos"=..\..\..\build\gizmos\gizmos.dsp - Package Owner=<4>
+Project: "gizmos"=..\..\..\..\contrib\build\gizmos\gizmos.dsp - Package Owner=<4>

 Package=<5>
 {{{
--- a/contrib/samples/mmedia/mmboard.bkl
+++ b/contrib/samples/mmedia/mmboard.bkl
@ -13,7 +13,7 @@
            mmboard.cpp
            mmbman.cpp
        </sources>
-        <wx-lib>mmedia</wx-lib>
+        <contrib-lib>mmedia</contrib-lib>
        <ldlibs cond="FORMAT=='autoconf'">$(EXTRALIBS_ESD)</ldlibs>
        <wx-lib>core</wx-lib>
        <wx-lib>base</wx-lib>
--- a/contrib/samples/mmedia/mmboard.dsw
+++ b/contrib/samples/mmedia/mmboard.dsw
@ -23,7 +23,7 @@ End Project Dependency

 ###############################################################################

-Project: "mmedia"=..\..\build\mmedia\mmedia.dsp - Package Owner=<4>
+Project: "mmedia"=..\..\..\contrib\build\mmedia\mmedia.dsp - Package Owner=<4>

 Package=<5>
 {{{
--- a/contrib/samples/ogl/ogledit/ogledit.bkl
+++ b/contrib/samples/ogl/ogledit/ogledit.bkl
@ -12,8 +12,8 @@
            view.cpp
            palette.cpp
        </sources>
-        <wx-lib>ogl</wx-lib>
-        <wx-lib>deprecated</wx-lib>
+        <contrib-lib>ogl</contrib-lib>
+        <contrib-lib>deprecated</contrib-lib>
        <wx-lib>core</wx-lib>
        <wx-lib>base</wx-lib>
        <win32-res>ogledit.rc</win32-res>
--- a/contrib/samples/ogl/ogledit/ogledit.dsw
+++ b/contrib/samples/ogl/ogledit/ogledit.dsw
@ -26,7 +26,7 @@ End Project Dependency

 ###############################################################################

-Project: "ogl"=..\..\..\build\ogl\ogl.dsp - Package Owner=<4>
+Project: "ogl"=..\..\..\..\contrib\build\ogl\ogl.dsp - Package Owner=<4>

 Package=<5>
 {{{
@ -38,7 +38,7 @@ Package=<4>

 ###############################################################################

-Project: "deprecated"=..\..\..\build\deprecated\deprecated.dsp - Package Owner=<4>
+Project: "deprecated"=..\..\..\..\contrib\build\deprecated\deprecated.dsp - Package Owner=<4>

 Package=<5>
 {{{
--- a/contrib/samples/ogl/studio/studio.bkl
+++ b/contrib/samples/ogl/studio/studio.bkl
@ -18,8 +18,8 @@
            dialogs.cpp
            csprint.cpp
        </sources>
-        <wx-lib>ogl</wx-lib>
-        <wx-lib>deprecated</wx-lib>
+        <contrib-lib>ogl</contrib-lib>
+        <contrib-lib>deprecated</contrib-lib>
        <wx-lib>adv</wx-lib>
        <wx-lib>html</wx-lib>
        <wx-lib>core</wx-lib>
--- a/contrib/samples/ogl/studio/studio.dsw
+++ b/contrib/samples/ogl/studio/studio.dsw
@ -32,7 +32,7 @@ End Project Dependency

 ###############################################################################

-Project: "ogl"=..\..\..\build\ogl\ogl.dsp - Package Owner=<4>
+Project: "ogl"=..\..\..\..\contrib\build\ogl\ogl.dsp - Package Owner=<4>

 Package=<5>
 {{{
@ -44,7 +44,7 @@ Package=<4>

 ###############################################################################

-Project: "deprecated"=..\..\..\build\deprecated\deprecated.dsp - Package Owner=<4>
+Project: "deprecated"=..\..\..\..\contrib\build\deprecated\deprecated.dsp - Package Owner=<4>

 Package=<5>
 {{{
--- a/contrib/samples/plot/plot.bkl
+++ b/contrib/samples/plot/plot.bkl
@ -8,7 +8,7 @@
        <sources>
            plot.cpp
        </sources>
-        <wx-lib>plot</wx-lib>
+        <contrib-lib>plot</contrib-lib>
        <wx-lib>core</wx-lib>
        <wx-lib>base</wx-lib>
        <win32-res>plot.rc</win32-res>
--- a/contrib/samples/plot/plot.dsw
+++ b/contrib/samples/plot/plot.dsw
@ -23,7 +23,7 @@ End Project Dependency

 ###############################################################################

-Project: "plot"=..\..\build\plot\plot.dsp - Package Owner=<4>
+Project: "plot"=..\..\..\contrib\build\plot\plot.dsp - Package Owner=<4>

 Package=<5>
 {{{
--- a/contrib/samples/stc/stctest.bkl
+++ b/contrib/samples/stc/stctest.bkl
@ -10,7 +10,7 @@
 	    edit.cpp
 	    prefs.cpp
        </sources>
-        <wx-lib>stc</wx-lib>
+        <contrib-lib>stc</contrib-lib>
        <wx-lib>core</wx-lib>
        <wx-lib>base</wx-lib>
    </exe>
--- a/contrib/samples/stc/stctest.dsw
+++ b/contrib/samples/stc/stctest.dsw
@ -23,7 +23,7 @@ End Project Dependency

 ###############################################################################

-Project: "stc"=..\..\build\stc\stc.dsp - Package Owner=<4>
+Project: "stc"=..\..\..\contrib\build\stc\stc.dsp - Package Owner=<4>

 Package=<5>
 {{{
--- a/contrib/samples/svg/svgtest.bkl
+++ b/contrib/samples/svg/svgtest.bkl
@ -8,7 +8,7 @@
        <sources>
            svgtest.cpp
        </sources>
-        <wx-lib>svg</wx-lib>
+        <contrib-lib>svg</contrib-lib>
        <wx-lib>core</wx-lib>
        <wx-lib>base</wx-lib>
    </exe>
--- a/contrib/samples/svg/svgtest.dsw
+++ b/contrib/samples/svg/svgtest.dsw
@ -23,7 +23,7 @@ End Project Dependency

 ###############################################################################

-Project: "svg"=..\..\build\svg\svg.dsp - Package Owner=<4>
+Project: "svg"=..\..\..\contrib\build\svg\svg.dsp - Package Owner=<4>

 Package=<5>
 {{{
--- a/samples/stc/stctest.bkl
+++ b/samples/stc/stctest.bkl
@ -10,7 +10,7 @@
 	    edit.cpp
 	    prefs.cpp
        </sources>
-        <wx-lib>stc</wx-lib>
+        <contrib-lib>stc</contrib-lib>
        <wx-lib>core</wx-lib>
        <wx-lib>base</wx-lib>
    </exe>
--- a/samples/stc/stctest.dsw
+++ b/samples/stc/stctest.dsw
@ -23,7 +23,7 @@ End Project Dependency

 ###############################################################################

-Project: "stc"=..\..\build\stc\stc.dsp - Package Owner=<4>
+Project: "stc"=..\..\..\contrib\build\stc\stc.dsp - Package Owner=<4>

 Package=<5>
 {{{
--- a/samples/svg/svgtest.bkl
+++ b/samples/svg/svgtest.bkl
@ -8,7 +8,7 @@
        <sources>
            svgtest.cpp
        </sources>
-        <wx-lib>svg</wx-lib>
+        <contrib-lib>svg</contrib-lib>
        <wx-lib>core</wx-lib>
        <wx-lib>base</wx-lib>
    </exe>
--- a/samples/svg/svgtest.dsw
+++ b/samples/svg/svgtest.dsw
@ -23,7 +23,7 @@ End Project Dependency

 ###############################################################################

-Project: "svg"=..\..\build\svg\svg.dsp - Package Owner=<4>
+Project: "svg"=..\..\..\contrib\build\svg\svg.dsp - Package Owner=<4>

 Package=<5>
 {{{