浏览代码

[scons] Add the library to the group when used buildlib building

bernard 11 年之前
父节点
当前提交
5ce39b8ad8
共有 1 个文件被更改,包括 4 次插入2 次删除
  1. 4 2
      tools/building.py

+ 4 - 2
tools/building.py

@@ -327,9 +327,11 @@ def DefineGroup(name, src, depend, **parameters):
 
     # check whether exist group library
     if not GetOption('buildlib') and os.path.exists(os.path.join(group['path'], GroupLibFullName(name, Env))):
-        Env.Append(LIBS = [GroupLibName(name, Env)])
         group['src'] = []
-        Env.Append(LIBPATH = [GetCurrentDir()])
+        if group.has_key('LIBS'): group['LIBS'] = group['LIBS'] + [GroupLibName(name, Env)]
+        else : group['LIBS'] = [GroupLibName(name, Env)]
+        if group.has_key('LIBPATH'): group['LIBPATH'] = group['LIBPATH'] + [GetCurrentDir()]
+        else : group['LIBPATH'] = [GetCurrentDir()]
 
     if group.has_key('LIBS'):
         Env.Append(LIBS = group['LIBS'])