X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2edad6fc48eb24235bbbb28345a568c1d859b15c..524d97b1c22daf69c57ca92c55ef4bbb206a0943:/build/bakefiles/wxwin.py?ds=inline

diff --git a/build/bakefiles/wxwin.py b/build/bakefiles/wxwin.py
index 0da8fe7cca..bad7270fa0 100644
--- a/build/bakefiles/wxwin.py
+++ b/build/bakefiles/wxwin.py
@@ -38,19 +38,20 @@ def mk_wxid(id):
     return wxid
 
 
-# All libs that are part of the main library (i.e. non-contrib):
+# All libs that are part of the main library:
 MAIN_LIBS = ['mono', 'base', 'core', 'adv', 'html', 'xml', 'net',
-             'media', 'odbc', 'qa', 'dbgrid', 'xrc']
+             'media', 'qa', 'xrc', 'aui', 'propgrid', 'richtext', 'stc']
 # List of library names/ids for categories with different names:
-LIBS_NOGUI = ['xml', 'net', 'odbc']
-LIBS_GUI   = ['core', 'adv', 'html', 'gl', 'qa', 'dbgrid', 'xrc', 'media']
+LIBS_NOGUI = ['xml', 'net']
+LIBS_GUI   = ['core', 'adv', 'html', 'gl', 'qa', 'xrc', 'media',
+              'aui', 'propgrid', 'richtext', 'stc']
 # Additional libraries that must be linked in:
 EXTRALIBS = {
     'gl' : '$(EXTRALIBS_OPENGL)',
     'xml' : '$(EXTRALIBS_XML)',
     'html' : '$(EXTRALIBS_HTML)',
-    'odbc' : '$(EXTRALIBS_ODBC)',
     'adv' : '$(PLUGIN_ADV_EXTRALIBS)',
+    'media' : '$(EXTRALIBS_MEDIA)',
 }
 
 def mkLibName(wxid):
@@ -83,13 +84,13 @@ def libToLink(wxlibname):
        For one of main libraries, libToLink('foo') returns '$(WXLIB_FOO)' which
        must be defined in common.bkl as either nothing (in monolithic build) or
        mkLibName('foo') (otherwise).
-       For contrib libraries, it returns mkDllName(wxlibname).       
        """
     if wxlibname in MAIN_LIBS:
         return '$(WXLIB_%s)' % wxlibname.upper()
     else:
         return mkLibName(wxlibname)
 
+
 def extraLdflags(wxlibname):
     if wxlibname in EXTRALIBS:
         return EXTRALIBS[wxlibname]
@@ -151,7 +152,3 @@ 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)