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

Made better integrations with the standard INCPATHS variable

This commit is contained in:
Simon 2015-07-07 18:07:21 +02:00
parent ae4f1f5e27
commit 5f9a900dc1
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
demos/xcode/wscript
View File

@ -26,6 +26,7 @@ def build(bld):
target='MyLib',
target_type='framework'
)
tg2 = bld(
features='cxx',

7
waflib/extras/xcode.py
View File

@ -427,6 +427,7 @@ class xcode(Build.BuildContext):
self.load_envs()
self.recurse([self.run_dir])
appname = getattr(Context.g_module, Context.APPNAME, os.path.basename(self.srcnode.abspath()))
p = PBXProject(appname, ('Xcode 6.0', 46), self.env)
@ -465,9 +466,9 @@ class xcode(Build.BuildContext):
settings = getattr(tg, 'settings', {})
# Setup include search paths
include_dirs = Utils.to_list(getattr(tg, 'includes', []))
include_dirs = [x.abspath() for x in self.as_nodes(include_dirs)]
includes_dirs_dict = {'HEADER_SEARCH_PATHS': ['$(inherited)'] + include_dirs}
# include_dirs = Utils.to_list(getattr(tg, 'includes', []))
# include_dirs = [x.abspath() for x in self.as_nodes(include_dirs)]
includes_dirs_dict = {'HEADER_SEARCH_PATHS': ['$(inherited)'] + tg.env['INCPATHS']}
# Set the HEADER_SEARCH_PATHS for all configurations
keys = set(settings.keys() + self.env.PROJ_CONFIGURATION.keys())