YGGverse/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/YGGverse/xash3d-fwgs.git synced 2025-01-17 18:40:02 +00:00
Code Issues Projects Releases Wiki Activity

msdev: add relative library paths

Browse Source
This commit is contained in:
mittorn 2019-04-09 12:10:52 +00:00 committed by Alibek Omarov
parent f6b3603934
commit ffaab11da9
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
scripts/waflib/msdev.py
View File

@ -592,17 +592,14 @@ class MsDevProject(MsDev):
for dep in deps: for dep in deps:
uselib_incs = bld.env['INCLUDES_%s' % dep] uselib_incs = bld.env['INCLUDES_%s' % dep]
for uselib_inc in uselib_incs: for uselib_inc in uselib_incs:
Logs.pprint('YELLOW', 'include ' + uselib_inc)
Logs.pprint('YELLOW', 'top_dir: ' + bld.top_dir)
Logs.pprint('YELLOW', 'path: ' + bld.path.abspath())
Logs.pprint('YELLOW', 'root: ' + bld.root.abspath())
root = bld.root.abspath().replace('\\', '/') root = bld.root.abspath().replace('\\', '/')
pref = os.path.commonprefix([root, uselib_inc]) pref = os.path.commonprefix([root, uselib_inc])
Logs.pprint('YELLOW', 'pref: '+ pref)
if pref == root: if pref == root:
node = bld.root.find_dir(uselib_inc) node = bld.root.find_dir(uselib_inc)
if node: if node:
includes.append(node.path_from(gen.path).replace('/', '\\')) inc = node.path_from(gen.path).replace('/', '\\')
includes.append(inc)
Logs.pprint('YELLOW', 'Added relative include: %s' % inc)
includes.append(uselib_inc) includes.append(uselib_inc)
return includes return includes
@ -647,6 +644,14 @@ class MsDevProject(MsDev):
except Errors.WafError: except Errors.WafError:
uselib_paths = bld.env['LIBPATH_%s' % dep] uselib_paths = bld.env['LIBPATH_%s' % dep]
for uselib_path in uselib_paths: for uselib_path in uselib_paths:
root = bld.root.abspath().replace('\\', '/')
pref = os.path.commonprefix([root, uselib_path])
if pref == root:
node = bld.root.find_dir(uselib_path)
if node:
libpath = node.path_from(gen.path).replace('/', '\\')
includes.append(libpath)
Logs.pprint('YELLOW', 'Added relative library path: %s' % libpath)
dirs.append(uselib_path) dirs.append(uselib_path)
pass pass
else: else: