a toolkit for developing cross-platform user interfaces with openGL (gradually migrating from github)
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

waftools/gyp_wrapper: update for multiple gyp files

not needed right now but in newer gyp versions there's a common.gypi
that we'll need to pull in.

+10 -4
+10 -4
waftools/gyp_wrapper.py
··· 3 3 import os 4 4 5 5 from waflib.Configure import conf 6 + from waflib import Utils 6 7 7 8 def parse_gyp_file(path): 8 9 parsed = None ··· 75 76 return ret 76 77 77 78 @conf 78 - def target_from_gyp(ctx, path, target): 79 - n = ctx.path.get_src().find_resource(path) 80 - gyp = parse_gyp_file(n.abspath()) 79 + def target_from_gyp(ctx, target, paths): 80 + paths = Utils.to_list(paths) 81 + 82 + gyp = {} 83 + 84 + for p in paths: 85 + n = ctx.path.get_src().find_resource(p) 86 + gyp.update(parse_gyp_file(n.abspath())) 81 87 82 88 t = find_target(gyp['targets'], target) 83 89 ··· 102 108 103 109 [from_gyp[x].extend(r.get(x, [])) for x in from_gyp.keys()] 104 110 105 - containing_dir = os.path.split(path)[0] 111 + containing_dir = os.path.split(paths[-1])[0] 106 112 from_gyp['sources'] = [ 107 113 '{}/{}'.format(containing_dir, s) for s in from_gyp['sources'] 108 114 if os.path.splitext(s)[1] in ('.c', '.cc', '.cpp')]