X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5d38306bc2d2c8329cc3408e227cf3c01feaac42..d40f860378b778081f076e192817ab4e6a7d4e13:/build/bakefiles/wxwin.py?ds=sidebyside

diff --git a/build/bakefiles/wxwin.py b/build/bakefiles/wxwin.py
index bb985a1a39..7a1473b623 100644
--- a/build/bakefiles/wxwin.py
+++ b/build/bakefiles/wxwin.py
@@ -41,7 +41,9 @@ LIBS_GUI   = ['core', 'adv', 'html', 'gl', 'dbgrid']
 EXTRALIBS = {
     'gl' : '$(EXTRALIBS_OPENGL)',
     'xml' : '$(EXTRALIBS_XML)',
+    'html' : '$(EXTRALIBS_HTML)',
     'odbc' : '$(EXTRALIBS_ODBC)',
+    'adv' : '$(PLUGIN_ADV_EXTRALIBS)',
 }
 
 def mkLibName(wxid):
@@ -141,18 +143,4 @@ def headersOnly(files):
 
 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)
+    return '%s:$(nativePaths(WXTOPDIR))build\\msw\\wx_%s.dsp' % (lib,lib)