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

diff --git a/build/bakefiles/common_contrib.bkl b/build/bakefiles/common_contrib.bkl
index 1a374a441a75e1a8f3a3549a00e76e6d3b44527f..4c95e7d2ad0734cd14eb6ec5aa226fa7a0cf77dc 100644 (file)
--- 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>

diff --git a/build/bakefiles/wxwin.py b/build/bakefiles/wxwin.py
index e607ed349e7b23ba4f87a1999aeef3e2936398b5..0da8fe7cca0123d39bfeae9d433f7adb2fd93bb1 100644 (file)
--- 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)

diff --git a/contrib/samples/animate/anitest.bkl b/contrib/samples/animate/anitest.bkl
index 214f00dfcc7d948efe62603ee1d931dfaf2d2b6c..0de634af080968407566d1d197cb37a1a8a3513d 100644 (file)
--- 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>

diff --git a/contrib/samples/animate/anitest.dsw b/contrib/samples/animate/anitest.dsw
index e1719c6d37d8514916c5e415b30a2b55b13dc3eb..a60ec839a63246dbdbc858956b0e3563ce9fd9b8 100644 (file)
--- 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>
 {{{

diff --git a/contrib/samples/deprecated/proplist/proplist.bkl b/contrib/samples/deprecated/proplist/proplist.bkl
index 675c5786ee2957a4324b3712971c5834c298719e..e2bd9fff9ab3cd4a36a9ee50c237ef3ef125effb 100644 (file)
--- 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>

diff --git a/contrib/samples/deprecated/proplist/proplist.dsw b/contrib/samples/deprecated/proplist/proplist.dsw
index 40c3d7f295563a3faaa6c8edd271fdedef54d530..18a97b99686c77f653c220f9077a020d247e4421 100644 (file)
--- 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>
 {{{

diff --git a/contrib/samples/deprecated/resource/resource.bkl b/contrib/samples/deprecated/resource/resource.bkl
index e5ea6a81373dfae80aeb1e115aea5169f6b61ec0..ea2cc2bf5e5d05ca7a040b60fcd08f491be59c50 100644 (file)
--- 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>

diff --git a/contrib/samples/deprecated/resource/resource.dsw b/contrib/samples/deprecated/resource/resource.dsw
index 4e0944daf00d87d5576a491ba5ea8ebe01a61dbe..eb6a517a06ea5f220fa6cb4d7aadd961395a9e4c 100644 (file)
--- 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>
 {{{

diff --git a/contrib/samples/deprecated/treelay/treelay.bkl b/contrib/samples/deprecated/treelay/treelay.bkl
index 814769fa50b83075ef9c59980705a3031b70f46f..d6aab6e621cc8736f2c0fd5df41bda77c33f6f6a 100644 (file)
--- 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>

diff --git a/contrib/samples/deprecated/treelay/treelay.dsw b/contrib/samples/deprecated/treelay/treelay.dsw
index 68ed3d6c62dc7880ddcfd1f03ce7b085c3c8ce2f..86b0f37a01bab06747255e2360b494520625e877 100644 (file)
--- 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>
 {{{

diff --git a/contrib/samples/fl/fl.bkl b/contrib/samples/fl/fl.bkl
index 49b34d19b419206290c61e3d6d7540bc7870d2a9..9747dfa47cf333bdb7fd1c1503a1ec9b6352351e 100644 (file)
--- 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>

diff --git a/contrib/samples/fl/fl.dsw b/contrib/samples/fl/fl.dsw
index ad55c8d39f1198eb521dfd19c510c1a3db880103..fbb5c0d97b1c91a379588960ef0051624be564b0 100644 (file)
--- 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>
 {{{

diff --git a/contrib/samples/foldbar/extended/extended.bkl b/contrib/samples/foldbar/extended/extended.bkl
index f6b407e9b503b190acca585d754e689db6e76b50..f48efaa3adc33a2b8ca2a5d0eb38e4b86c16d7d5 100644 (file)
--- 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>

diff --git a/contrib/samples/foldbar/extended/extended.dsw b/contrib/samples/foldbar/extended/extended.dsw
index 28d65e3490e403b3d1968b9f22e13dc625071c7d..e62368a5c6042d38ee5c1467c71a15502116dd43 100644 (file)
--- 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>
 {{{

diff --git a/contrib/samples/foldbar/foldpanelbar/foldtest.bkl b/contrib/samples/foldbar/foldpanelbar/foldtest.bkl
index 0d4049adb07ba847c8d633f8d85008fe62663e28..5498b904637fb0556801e149c0d87255ba1ff387 100644 (file)
--- 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>

diff --git a/contrib/samples/foldbar/foldpanelbar/foldtest.dsw b/contrib/samples/foldbar/foldpanelbar/foldtest.dsw
index c25acef39eea5a354df0dc5a21fe74629094ad61..37905b27f9c063196e3c5a6f196c440cff6cdaad 100644 (file)
--- 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>
 {{{

diff --git a/contrib/samples/gizmos/dynsash/dynsash.bkl b/contrib/samples/gizmos/dynsash/dynsash.bkl
index 640ba00078fa377da87784ccba580b4179a1eb16..c4c2618ab15d01566a2c488e70cec83071b08615 100644 (file)
--- 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>

diff --git a/contrib/samples/gizmos/dynsash/dynsash.dsw b/contrib/samples/gizmos/dynsash/dynsash.dsw
index dc51717e477167e7c5f66cf8895709cbcf4201eb..000b50aa7cb958e65bc62d73c03a7120dcdd3a8b 100644 (file)
--- 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>
 {{{

diff --git a/contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl b/contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl
index 70c4179733082a14b079b0480dd61f9614e24c94..4843a97f3a9f0db8a8aa17c20da6b7595c8ee0b1 100644 (file)
--- 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>

diff --git a/contrib/samples/gizmos/dynsash_switch/dynsash_switch.dsw b/contrib/samples/gizmos/dynsash_switch/dynsash_switch.dsw
index 4e256fe77fe7d18ecf48d68312cf39d08fdc37ef..3a82252088143ccf2e1d393d04ca377c02cc465e 100644 (file)
--- 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>
 {{{

diff --git a/contrib/samples/gizmos/editlbox/editlbox.bkl b/contrib/samples/gizmos/editlbox/editlbox.bkl
index 72019758c89eac65181597c4154fc139cb59ea1c..0df2855ab2530c54909ccffdea50c33b1e8b2936 100644 (file)
--- 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>

diff --git a/contrib/samples/gizmos/editlbox/editlbox.dsw b/contrib/samples/gizmos/editlbox/editlbox.dsw
index ffa5fcd8b5be04a36d51e4a030d448fb9490288c..915478de901cf4448560901c4296dc650bf835f7 100644 (file)
--- 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>
 {{{

diff --git a/contrib/samples/gizmos/led/led.bkl b/contrib/samples/gizmos/led/led.bkl
index c478f02b65850a6f8b065ad52c0628e3d2e2294c..8a41662be12dfbd1d8616286e5407e93adffba8f 100644 (file)
--- 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>

diff --git a/contrib/samples/gizmos/led/led.dsw b/contrib/samples/gizmos/led/led.dsw
index fe5d9e3892218cdcd2a9950640345cc3690f3234..c736fcbaf9be29a201775e075f1769b5a76f61d5 100644 (file)
--- 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>
 {{{

diff --git a/contrib/samples/gizmos/multicell/multicell.bkl b/contrib/samples/gizmos/multicell/multicell.bkl
index 75b8f846f137721b52f131ecc89a53fb44458146..e59e4d931184fc39d0d7a5937c58de4a8a090413 100644 (file)
--- 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>

diff --git a/contrib/samples/gizmos/multicell/multicell.dsw b/contrib/samples/gizmos/multicell/multicell.dsw
index ad6321dc25b597e5bcfeccc96b1bf5f58fdcfa8f..1695ef5655f6b8a81ad60be9a8d5fd5bf52e7a97 100644 (file)
--- 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>
 {{{

diff --git a/contrib/samples/gizmos/splittree/splittree.bkl b/contrib/samples/gizmos/splittree/splittree.bkl
index 33a447e4fa8fc80b7bfad1d45f01e98ef968da62..87d3a666393b4b402afb70fa6412fe33924f9622 100644 (file)
--- 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>

diff --git a/contrib/samples/gizmos/splittree/splittree.dsw b/contrib/samples/gizmos/splittree/splittree.dsw
index 67a4ab06ce2cc2ca594c18c7d56c89c9ffa5f107..4ec7bbc5a96843e00a35be09ac0d7e504dceb8c2 100644 (file)
--- 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>
 {{{

diff --git a/contrib/samples/mmedia/mmboard.bkl b/contrib/samples/mmedia/mmboard.bkl
index e4b5962b3e9624955e8755b93b227cb811cf3bd0..4b1c94cad153f8c1719de4c2166d81300029a674 100644 (file)
--- 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>

diff --git a/contrib/samples/mmedia/mmboard.dsw b/contrib/samples/mmedia/mmboard.dsw
index 8c56be10d36dac0207ad061bc0e37759b0bf75d7..38f9e0145d41e41d962ef5641a54025a6e440cdf 100644 (file)
--- 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>
 {{{

diff --git a/contrib/samples/ogl/ogledit/ogledit.bkl b/contrib/samples/ogl/ogledit/ogledit.bkl
index 0b161ddf843bc21a8fa90d3bcd1754a79f679e50..4b72d1cb63e09e396db10f5b80146f872a0f4b2f 100644 (file)
--- 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>

diff --git a/contrib/samples/ogl/ogledit/ogledit.dsw b/contrib/samples/ogl/ogledit/ogledit.dsw
index 3f93ca6de3f3ad2f72bf8ff7a4ce575d0b290f3a..9c9665d5f820d5eaa9920ae7ce99c79dc230303f 100644 (file)
--- 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>
 {{{

diff --git a/contrib/samples/ogl/studio/studio.bkl b/contrib/samples/ogl/studio/studio.bkl
index da36eac77ef86219fcc75f5493df1262f980b58b..1f41e42b5b2ed206b5d39d13b01a32f0ceb5de0d 100644 (file)
--- 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>

diff --git a/contrib/samples/ogl/studio/studio.dsw b/contrib/samples/ogl/studio/studio.dsw
index e80241e047f569125b2dc5945f2265b498db47b6..b99cd69543bbd02ac9fe0883342cd7d2a82ccc3c 100644 (file)
--- 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>
 {{{

diff --git a/contrib/samples/plot/plot.bkl b/contrib/samples/plot/plot.bkl
index 8e1518a07b4847eac0e0dfaf93784dc92d9dce1b..cfef76512de23ed96a3887f0f57dafbcac7050ee 100644 (file)
--- 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>

diff --git a/contrib/samples/plot/plot.dsw b/contrib/samples/plot/plot.dsw
index 72e176402e1e77dbeecffafae2007b4bf4d316b9..7be3c56ff3dd33960eee5aab034ad16baf7a0a26 100644 (file)
--- 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>
 {{{

diff --git a/contrib/samples/stc/stctest.bkl b/contrib/samples/stc/stctest.bkl
index ace1810616cbbe67a28446dc67a6ffdfee8f3d96..a02c4fd40ed78379e69d9d3dc5abad1c639a0582 100644 (file)
--- 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>

diff --git a/contrib/samples/stc/stctest.dsw b/contrib/samples/stc/stctest.dsw
index 7d28f25943040a0ea1f33c17cbdd330d0309b042..a765423dba2e44651a1af1c47696d6f4b528d695 100644 (file)
--- 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>
 {{{

diff --git a/contrib/samples/svg/svgtest.bkl b/contrib/samples/svg/svgtest.bkl
index 6796c6e488d47ecea5efd2ebfafac58129a4c69d..59724bd0a63805b468f4e03a5f717989a7afca5d 100644 (file)
--- 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>

diff --git a/contrib/samples/svg/svgtest.dsw b/contrib/samples/svg/svgtest.dsw
index e5613b5e97bed263aa9a63b7e90b917dd465989a..92d6ea22c5cd1306a81876857f80f288bbf83c0f 100644 (file)
--- 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>
 {{{

diff --git a/samples/stc/stctest.bkl b/samples/stc/stctest.bkl
index ace1810616cbbe67a28446dc67a6ffdfee8f3d96..a02c4fd40ed78379e69d9d3dc5abad1c639a0582 100644 (file)
--- 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>

diff --git a/samples/stc/stctest.dsw b/samples/stc/stctest.dsw
index 7d28f25943040a0ea1f33c17cbdd330d0309b042..a765423dba2e44651a1af1c47696d6f4b528d695 100644 (file)
--- 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>
 {{{

diff --git a/samples/svg/svgtest.bkl b/samples/svg/svgtest.bkl
index 6796c6e488d47ecea5efd2ebfafac58129a4c69d..59724bd0a63805b468f4e03a5f717989a7afca5d 100644 (file)
--- 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>

diff --git a/samples/svg/svgtest.dsw b/samples/svg/svgtest.dsw
index e5613b5e97bed263aa9a63b7e90b917dd465989a..92d6ea22c5cd1306a81876857f80f288bbf83c0f 100644 (file)
--- 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>
 {{{