fixed wrong srcdir in contrib w/ autoconf

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

diff --git a/build/bakefiles/wxwin.py b/build/bakefiles/wxwin.py
index 071e25d93bec02d7646f3b67d9793dcdcae9f985..0f8facd4df65571bb851bdb38b5d16b1abe26c16 100644 (file)
--- a/build/bakefiles/wxwin.py
+++ b/build/bakefiles/wxwin.py
@@ -11,9 +11,10 @@ import utils
 # register a substitution function for it that provides additional knowledge
 # about the option (in this case that it does not contain dir separators and
 # so utils.nativePaths() doesn't have to do anything with it):
 # register a substitution function for it that provides additional knowledge
 # about the option (in this case that it does not contain dir separators and
 # so utils.nativePaths() doesn't have to do anything with it):

-def __noopSubst(func, opt):
-    return '$(%s)' % opt.name
+def __noopSubst(func, name):
+    return '$(%s)' % name

 utils.addSubstituteCallback('CFG', __noopSubst)
 utils.addSubstituteCallback('CFG', __noopSubst)

+utils.addSubstituteCallback('LIBDIRNAME', __noopSubst)

 
 
 def mk_wxid(id):
 
 
 def mk_wxid(id):


@@ -29,10 +30,11 @@ def mk_wxid(id):
 
 
 # All libs that are part of the main library (i.e. non-contrib):
 
 
 # All libs that are part of the main library (i.e. non-contrib):

-MAIN_LIBS = ['mono', 'base', 'core', 'html', 'xml']
+MAIN_LIBS = ['mono', 'base', 'core', 'adv', 'html', 'xml', 'net',
+             'odbc', 'dbgrid']

 # List of library names/ids for categories with different names:
 # List of library names/ids for categories with different names:

-LIBS_NOGUI = ['xml']
-LIBS_GUI   = ['core', 'html', 'gl']
+LIBS_NOGUI = ['xml', 'net', 'odbc']
+LIBS_GUI   = ['core', 'adv', 'html', 'gl', 'dbgrid']

 
 def mkLibName(wxid):
     """Returns string that can be used as library name, including name
 
 def mkLibName(wxid):
     """Returns string that can be used as library name, including name


@@ -105,3 +107,20 @@ def getVersionMinor():
     return getVersion()[1]
 def getVersionRelease():
     return getVersion()[2]
     return getVersion()[1]
 def getVersionRelease():
     return getVersion()[2]

+
+
+def headersOnly(files):
+    """Filters 'files' so that only headers are left. Used with
+       <msvc-project-files> to add headers to VC++ projects but not files such
+       as arrimpl.cpp."""
+    
+    def callback(cond, sources):
+        prf = suf = ''
+        if sources[0].isspace(): prefix=' '
+        if sources[-1].isspace(): suffix=' '
+        retval = []
+        for s in sources.split():
+            if s.endswith('.h'):
+                retval.append(s)
+        return '%s%s%s' % (prf, ' '.join(retval), suf)
+    return utils.substitute2(files, callback)