fixed DSW dependencies for samples

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

build/bakefiles/common.bkl

@@ -462,10 +462,8 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(LIBDIRNAME)\wx\setup.h
     <!-- Link against one wxWin library. Value must be literal! -->
     <define-tag name="wx-lib" rules="exe,dll,module">
         <sys-lib>$(wxwin.libToLink(value))</sys-lib>
-        <if cond="FORMAT=='msvc6prj'">
-            <depends-on-dsp>
-                $(value):$(nativePaths(WXTOPDIR))build\msw\wx_$(value).dsp
-            </depends-on-dsp>
+        <if cond="FORMAT=='msvc6prj' and MONOLITHIC=='0'">
+            <depends-on-dsp>$(wxwin.makeDspDependency(value))</depends-on-dsp>
         </if>
     </define-tag>
 

build/bakefiles/wxwin.py

@@ -125,3 +125,22 @@ def headersOnly(files):
                 retval.append(s)
         return '%s%s%s' % (prf, ' '.join(retval), suf)
     return utils.substitute2(files, callback)
+
+
+def makeDspDependency(lib):
+    """Returns suitable entry for <depends-on-dsp> for main libs."""
+
+    DEPS_TABLE = {
+        'core':'base',
+        'adv':'core',
+        'html':'core',
+        'xml':'base',
+        'net':'base',
+        'odbc':'base',
+        'dbgrid':'adv,odbc',
+    }
+    if lib in DEPS_TABLE:
+        deps = ':%s' % DEPS_TABLE[lib]
+    else:
+        deps = ''
+    return '%s:$(nativePaths(WXTOPDIR))build\msw\wx_%s.dsp%s' % (lib,lib,deps)