Define as a macro as the remaining fields of the split.

This commit is contained in:
Chris Johns 2013-03-08 18:20:11 +11:00
parent 5ec7fb8151
commit b48dc23f95
2 changed files with 5 additions and 3 deletions

View File

@ -447,14 +447,14 @@ class file:
if len(ls) == 2:
self.defines[d] = '1'
else:
self.defines[d] = ls[2].strip()
self.defines[d] = ' '.join([f.strip() for f in ls[2:]])
else:
self._warning("macro '%s' already defined" % (d))
else:
if len(ls) == 2:
self.defines[d] = '1'
else:
self.defines[d] = ls[2].strip()
self.defines[d] = ' '.join([f.strip() for f in ls[2:]])
def _undefine(self, config, ls):
if len(ls) <= 1:

View File

@ -216,7 +216,9 @@ class buildset:
if l.startswith('%define'):
ls = l.split()
if len(ls) > 2:
self.defaults[ls[1].strip()] = ('none', 'none', ls[2].strip())
self.defaults[ls[1].strip()] = ('none',
'none',
' '.join([f.strip() for f in ls[2:]]))
else:
self.defaults[ls[1].strip()] = ('none', 'none', '1')
elif l.startswith('%include'):