From b8c716a918fe270a667e4bf76befe24d8b319fe6 Mon Sep 17 00:00:00 2001 From: Scott Determan Date: Sun, 18 Jan 2015 17:36:58 -0800 Subject: [PATCH] VSProject: Handle tuples in CPPDEFINES: The VSProject generator now handles tuples in addition to strings and dicts when converting environment variables such as CPPDEFINES. --- site_scons/site_tools/VSProject.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/site_scons/site_tools/VSProject.py b/site_scons/site_tools/VSProject.py index 724dfb5bc..240ac159a 100644 --- a/site_scons/site_tools/VSProject.py +++ b/site_scons/site_tools/VSProject.py @@ -124,9 +124,12 @@ def itemList(items, sep): return items def gen(): for item in xsorted(items): - if type(item) == dict: + if isinstance(item, dict): for k, v in xsorted(item.items()): yield k + '=' + v + elif isinstance(item, (tuple, list)): + assert len(item) == 2, "Item shoud have exactly two elements: " + str(item) + yield '%s=%s' % tuple(item) else: yield item yield sep