diff options
| author | Grissiom <[email protected]> | 2014-11-18 17:04:35 +0800 |
|---|---|---|
| committer | Grissiom <[email protected]> | 2014-11-18 17:08:21 +0800 |
| commit | 767720c1f7bb558dfee8df73dfb982496fd387bd (patch) | |
| tree | 0ced746782cb3cc5908fbc3c413fa5d48ac0636c | |
| parent | 31d214ff805776cc9265238ee512382589d6d54f (diff) | |
SCons: allow set object files in DefineGroup
The source files can be the raw file names end with .c or .o. So return
the raw file names is more flexible than wrap them with Object.
| -rw-r--r-- | tools/building.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/building.py b/tools/building.py index 79e6fd1a4b..0bdaa8696b 100644 --- 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: |