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

Fix issues with pkg-config result not being read out properly always, resulting in gtk-stats not being built

Browse Source
This commit is contained in:
rdb 2009-11-27 19:40:09 +00:00
parent eb341f8a54
commit 3ccc0d4603
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
makepanda/makepanda.py
View File

@ -4154,7 +4154,7 @@ if (PkgSkip("PANDATOOL")==0):
# DIRECTORY: pandatool/src/gtk-stats/ # DIRECTORY: pandatool/src/gtk-stats/
# #
if (PkgSkip("PANDATOOL")==0 and (sys.platform.startswith("win") or PkgConfigHavePkg("gtk+-2.0"))): if (PkgSkip("PANDATOOL")==0 and (sys.platform.startswith("win") or PkgSkip("GTK2")==0)):
if (sys.platform.startswith("win")): if (sys.platform.startswith("win")):
OPTS=['DIR:pandatool/src/win-stats'] OPTS=['DIR:pandatool/src/win-stats']
TargetAdd('pstats_composite1.obj', opts=OPTS, input='winstats_composite1.cxx') TargetAdd('pstats_composite1.obj', opts=OPTS, input='winstats_composite1.cxx')

3
makepanda/makepandacore.py
View File

@ -908,7 +908,8 @@ def PkgConfigHavePkg(pkgname, tool = "pkg-config"):
else: else:
return bool(LocateBinary(tool) != None) return bool(LocateBinary(tool) != None)
result = handle.read().strip() result = handle.read().strip()
if handle.close() != 0: returnval = handle.close()
if returnval != None and returnval != 0:
return False return False
return bool(len(result) > 0) return bool(len(result) > 0)