inside <wx-data> we need to use instead of /

[wxWidgets.git] / build / bakefiles / wxwin.py

diff --git a/build/bakefiles/wxwin.py b/build/bakefiles/wxwin.py
index d29d18057a7ba817748f7ba4c6c03a1c8054dd9f..bad7270fa049ff3958717c7adc88d1bdc65d7e50 100644 (file)
--- a/build/bakefiles/wxwin.py
+++ b/build/bakefiles/wxwin.py
@@ -38,19 +38,20 @@ def mk_wxid(id):
     return wxid
 
 
     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',
 MAIN_LIBS = ['mono', 'base', 'core', 'adv', 'html', 'xml', 'net',

-             'media', 'odbc', 'qa', 'dbgrid', 'xrc', 'aui', 'richtext']
+             'media', 'qa', 'xrc', 'aui', 'propgrid', 'richtext', 'stc']

 # List of library names/ids for categories with different names:
 # 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', 'aui', 'richtext']
+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)',
 # Additional libraries that must be linked in:
 EXTRALIBS = {
     'gl' : '$(EXTRALIBS_OPENGL)',
     'xml' : '$(EXTRALIBS_XML)',
     'html' : '$(EXTRALIBS_HTML)',

-    'odbc' : '$(EXTRALIBS_ODBC)',

     'adv' : '$(PLUGIN_ADV_EXTRALIBS)',
     'adv' : '$(PLUGIN_ADV_EXTRALIBS)',

+    'media' : '$(EXTRALIBS_MEDIA)',

 }
 
 def mkLibName(wxid):
 }
 
 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 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)
 
        """
     if wxlibname in MAIN_LIBS:
         return '$(WXLIB_%s)' % wxlibname.upper()
     else:
         return mkLibName(wxlibname)
 

+

 def extraLdflags(wxlibname):
     if wxlibname in EXTRALIBS:
         return EXTRALIBS[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 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)