TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 08:44:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

fltk-config fix

Browse Source
This commit is contained in:
rdb 2011-03-09 13:16:44 +00:00
parent 83261415be
commit 5b9ad3832c
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
makepanda/makepandacore.py
View File

@ -773,7 +773,7 @@ def GetThirdpartyBase():
global THIRDPARTYBASE global THIRDPARTYBASE
if (THIRDPARTYBASE != None): if (THIRDPARTYBASE != None):
return THIRDPARTYBASE return THIRDPARTYBASE
THIRDPARTYBASE = "thirdparty" THIRDPARTYBASE = "thirdparty"
if "MAKEPANDA_THIRDPARTY" in os.environ: if "MAKEPANDA_THIRDPARTY" in os.environ:
THIRDPARTYBASE = os.environ["MAKEPANDA_THIRDPARTY"] THIRDPARTYBASE = os.environ["MAKEPANDA_THIRDPARTY"]
@ -982,13 +982,16 @@ def PkgConfigGetLibs(pkgname, tool = "pkg-config"):
return [] return []
if (tool == "pkg-config"): if (tool == "pkg-config"):
handle = os.popen(LocateBinary("pkg-config") + " --silence-errors --libs-only-l " + pkgname) handle = os.popen(LocateBinary("pkg-config") + " --silence-errors --libs-only-l " + pkgname)
elif (tool == "fltk-config"):
handle = os.popen(LocateBinary("fltk-config") + " --ldflags")
else: else:
handle = os.popen(LocateBinary(tool) + " --libs") handle = os.popen(LocateBinary(tool) + " --libs")
result = handle.read().strip() result = handle.read().strip()
handle.close() handle.close()
libs = [] libs = []
for l in result.split(" "): for l in result.split(" "):
libs.append(l) if l.startswith("-l"):
libs.append(l)
return libs return libs
def PkgConfigGetIncDirs(pkgname, tool = "pkg-config"): def PkgConfigGetIncDirs(pkgname, tool = "pkg-config"):
@ -1076,7 +1079,7 @@ def GetLibCache():
if (".so " in lib): if (".so " in lib):
lib = lib.split(".so", 1)[0][3:] lib = lib.split(".so", 1)[0][3:]
LD_CACHE.append(lib) LD_CACHE.append(lib)
libdirs = ["/lib", "/usr/lib", "/usr/local/lib", "/usr/PCBSD/local/lib", "/usr/X11/lib", "/usr/X11R6/lib"] libdirs = ["/lib", "/usr/lib", "/usr/local/lib", "/usr/PCBSD/local/lib", "/usr/X11/lib", "/usr/X11R6/lib"]
if platform.architecture()[0] == "64bit": if platform.architecture()[0] == "64bit":
libdirs += ["/lib64", "/usr/lib64"] libdirs += ["/lib64", "/usr/lib64"]
@ -1090,7 +1093,7 @@ def GetLibCache():
libs += glob.glob(path + "/lib*.a") libs += glob.glob(path + "/lib*.a")
if (sys.platform == "darwin"): if (sys.platform == "darwin"):
libs += glob.glob(path + "/lib*.dylib") libs += glob.glob(path + "/lib*.dylib")
for l in libs: for l in libs:
lib = os.path.basename(l).split(".so", 1)[0].split(".a", 1)[0].split(".dylib", 1)[0][3:] lib = os.path.basename(l).split(".so", 1)[0].split(".a", 1)[0].split(".dylib", 1)[0][3:]
if lib not in LD_CACHE: if lib not in LD_CACHE:
@ -1270,7 +1273,7 @@ def GetSdkDir(sdkname, sdkkey = None):
sdkbase = "sdks" sdkbase = "sdks"
if "MAKEPANDA_SDKS" in os.environ: if "MAKEPANDA_SDKS" in os.environ:
sdkbase = os.environ["MAKEPANDA_SDKS"] sdkbase = os.environ["MAKEPANDA_SDKS"]
sdir = sdkbase[:] sdir = sdkbase[:]
if (sys.platform.startswith("win")): if (sys.platform.startswith("win")):
sdir += "/win" sdir += "/win"
@ -1501,7 +1504,7 @@ def SdkLocatePhysX():
SDK["PHYSX"] = dir SDK["PHYSX"] = dir
SDK["PHYSXLIBS"] = dir + "/lib" SDK["PHYSXLIBS"] = dir + "/lib"
return return
# Try to find a PhysX installation on the system. # Try to find a PhysX installation on the system.
for (ver, key) in PHYSXVERSIONINFO: for (ver, key) in PHYSXVERSIONINFO:
if (sys.platform == "win32"): if (sys.platform == "win32"):
@ -1535,13 +1538,13 @@ def SdkLocateSpeedTree():
if not speedtrees: if not speedtrees:
# No installed SpeedTree SDK. # No installed SpeedTree SDK.
return return
speedtrees.sort() speedtrees.sort()
version, dirname = speedtrees[-1] version, dirname = speedtrees[-1]
SDK["SPEEDTREE"] = os.path.join(dir, dirname) SDK["SPEEDTREE"] = os.path.join(dir, dirname)
SDK["SPEEDTREEAPI"] = "OpenGL" SDK["SPEEDTREEAPI"] = "OpenGL"
SDK["SPEEDTREEVERSION"] = '%s.%s' % (version[0], version[1]) SDK["SPEEDTREEVERSION"] = '%s.%s' % (version[0], version[1])
######################################################################## ########################################################################
## ##
## SDK Auto-Disables ## SDK Auto-Disables