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

Merge branch 'release/1.9.x'

Browse Source
This commit is contained in:
rdb 2015-12-03 16:38:25 +01:00
commit c644e7ae49
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
makepanda/makepandacore.py
View File

@ -1599,9 +1599,11 @@ def SmartPkgEnable(pkg, pkgconfig = None, libs = None, incs = None, defs = None,
if not custom_loc: if not custom_loc:
incdirs += list(SYS_INC_DIRS) incdirs += list(SYS_INC_DIRS)
for ppkg, pdir in INCDIRECTORIES: for ppkg, pdir in INCDIRECTORIES[:]:
if pkg == ppkg or (ppkg == "ALWAYS" and not custom_loc): if pkg == ppkg or (ppkg == "ALWAYS" and not custom_loc):
incdirs.append(pdir) incdirs.append(pdir)
if custom_loc and pkg != target_pkg:
IncDirectory(target_pkg, pdir)
# The incs list contains both subdirectories to explicitly add to # The incs list contains both subdirectories to explicitly add to
# the include path and header files to check the existence of. # the include path and header files to check the existence of.
@ -1612,7 +1614,7 @@ def SmartPkgEnable(pkg, pkgconfig = None, libs = None, incs = None, defs = None,
incdir = sorted(glob.glob(os.path.join(dir, i)))[-1] incdir = sorted(glob.glob(os.path.join(dir, i)))[-1]
# Note: It's possible to specify a file instead of a dir, for the sake of checking if it exists. # Note: It's possible to specify a file instead of a dir, for the sake of checking if it exists.
if incdir is None and i.endswith(".h"): if incdir is None and (i.endswith('/Dense') or i.endswith(".h")):
have_pkg = False have_pkg = False
if VERBOSE or custom_loc: if VERBOSE or custom_loc:
print(GetColor("cyan") + "Couldn't find header file " + i + GetColor()) print(GetColor("cyan") + "Couldn't find header file " + i + GetColor())