Merge pull request #376 from grissiom/tools-next

SCons: allow set object files in DefineGroup
2014-11-18 19:08:04 +08:00 · 2014-11-18 19:08:04 +08:00 · 2ad82e749d
parent 31d214ff80 767720c1f7
commit 2ad82e749d
1 changed files with 3 additions and 2 deletions
--- a/tools/building.py
+++ b/tools/building.py
@ -364,9 +364,10 @@ def DefineGroup(name, src, depend, **parameters):
    if group.has_key('LIBPATH'):
        Env.Append(LIBPATH = group['LIBPATH'])

-    objs = Env.Object(group['src'])
    if group.has_key('LIBRARY'):
-        objs = Env.Library(name, objs)
+        objs = Env.Library(name, group['src'])
+    else:
+        objs = group['src']

    # merge group 
    for g in Projects: