Explorar el Código

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.
Grissiom hace 10 años
padre
commit
767720c1f7
Se han modificado 1 ficheros con 3 adiciones y 2 borrados
  1. 3 2
      tools/building.py

+ 3 - 2
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: