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

Use wx-config found in thirdparty bin/ dir if present

Browse Source
This commit is contained in:
rdb 2009-11-18 10:29:23 +00:00
parent b53d78d694
commit 7d421efcfb
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
makepanda/makepandacore.py
View File

@ -293,6 +293,8 @@ def GetDirectorySize(dir):
######################################################################## ########################################################################
def LocateBinary(binary): def LocateBinary(binary):
if os.path.isfile(binary):
return binary
if "PATH" not in os.environ or os.environ["PATH"] == "": if "PATH" not in os.environ or os.environ["PATH"] == "":
p = os.defpath p = os.defpath
else: else:
@ -1071,6 +1073,13 @@ def SmartPkgEnable(pkg, pkgconfig = None, libs = None, incs = None, defs = None,
if (os.path.isdir(GetThirdpartyDir() + pkg.lower())): if (os.path.isdir(GetThirdpartyDir() + pkg.lower())):
IncDirectory(pkg, GetThirdpartyDir() + pkg.lower() + "/include") IncDirectory(pkg, GetThirdpartyDir() + pkg.lower() + "/include")
LibDirectory(pkg, GetThirdpartyDir() + pkg.lower() + "/lib") LibDirectory(pkg, GetThirdpartyDir() + pkg.lower() + "/lib")
# TODO: check for a .pc file in the lib/pkg-config/ dir
if (tool != None and os.path.isfile(GetThirdpartyDir() + pkg.lower() + "/bin/" + tool):
for i in PkgConfigGetLibs(pkg.lower(), tool):
LibName(pkg, i)
for i, j in PkgConfigGetDefSymbols(pkg.lower(), tool).items():
DefSymbol(pkg, i, j)
return
for l in libs: for l in libs:
libname = l libname = l
if (l.startswith("lib")): if (l.startswith("lib")):