TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 10:22:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

pick up ode-config include fix on head

Browse Source
This commit is contained in:
rdb 2013-04-12 15:10:00 +00:00
parent c32becb2a1
commit 1c74e7f7bf
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
makepanda/makepandacore.py
View File

@ -1322,11 +1322,14 @@ def PkgConfigGetIncDirs(pkgname, tool = "pkg-config"):
result = handle.read().strip() result = handle.read().strip()
if len(result) == 0: return [] if len(result) == 0: return []
handle.close() handle.close()
libs = [] dirs = []
for l in result.split(" "): for opt in result.split(" "):
if (l.startswith("-I")): if (opt.startswith("-I")):
libs.append(l.replace("-I", "").replace("\"", "").strip()) inc_dir = opt.replace("-I", "").replace("\"", "").strip()
return libs # Hack for ODE, otherwise -S/usr/include gets added to interrogate
if inc_dir != '/usr/include' or inc_dir != '/usr/include/':
dirs.append(inc_dir)
return dirs
def PkgConfigGetLibDirs(pkgname, tool = "pkg-config"): def PkgConfigGetLibDirs(pkgname, tool = "pkg-config"):
"""Returns a list of library paths for the package, NOT prefixed by -L.""" """Returns a list of library paths for the package, NOT prefixed by -L."""