FWGS
/
waf
mirror of https://gitlab.com/ita1024/waf.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue 1080

This commit is contained in:
Thomas Nagy 2011-12-09 00:54:59 +01:00
parent a639280339
commit 856b53c046
4 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
playground/relocate/c/a.c
View File

@ -1 +1,4 @@
#include "a.h"
int k = 332;

1
playground/relocate/c/a/a.h Normal file
View File

@ -0,0 +1 @@
int u = 0;

2
playground/relocate/c/wscript
View File

@ -7,5 +7,5 @@ def configure(conf):
conf.load('relocation compiler_c')
def build(bld):
bld.shlib(source='a.c', target='one')
bld.shlib(source='a.c', target='one', includes='a')
bld.program(source='main.c', target='two', use='one')

2
waflib/extras/relocation.py
View File

@ -80,6 +80,6 @@ def apply_incpaths(self):
lst = self.to_incnodes(self.to_list(getattr(self, 'includes', [])) + self.env['INCLUDES'])
self.includes_nodes = lst
bld = self.bld
self.env['INCPATHS'] = [x.is_child_of(bld.srcnode) and x.path_from(bld.srcnode) or x.abspath() for x in lst]
self.env['INCPATHS'] = [x.is_child_of(bld.srcnode) and x.path_from(bld.bldnode) or x.abspath() for x in lst]