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

Fix incorrect PC-BSD checks

Browse Source
This commit is contained in:
rdb 2010-03-08 19:22:14 +00:00
parent 181663ad66
commit 85bd762709
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
makepanda/makepanda.py
View File

@ -443,7 +443,7 @@ if (COMPILER=="LINUX"):
IncDirectory("FREETYPE", "/usr/X11/include/freetype2") IncDirectory("FREETYPE", "/usr/X11/include/freetype2")
IncDirectory("OPENGL", "/usr/X11R6/include") IncDirectory("OPENGL", "/usr/X11R6/include")
if (platform.uname()[1]=="pcbsd"): if (os.path.exists("/usr/PCBSD")):
IncDirectory("ALWAYS", "/usr/PCBSD/local/include") IncDirectory("ALWAYS", "/usr/PCBSD/local/include")
LibDirectory("ALWAYS", "/usr/PCBSD/local/lib") LibDirectory("ALWAYS", "/usr/PCBSD/local/lib")

4
makepanda/makepandacore.py
View File

@ -1178,7 +1178,7 @@ def SmartPkgEnable(pkg, pkgconfig = None, libs = None, incs = None, defs = None,
incdir = sorted(glob.glob("/usr/include/" + i))[-1] incdir = sorted(glob.glob("/usr/include/" + i))[-1]
elif (len(glob.glob("/usr/local/include/" + i)) > 0): elif (len(glob.glob("/usr/local/include/" + i)) > 0):
incdir = sorted(glob.glob("/usr/local/include/" + i))[-1] incdir = sorted(glob.glob("/usr/local/include/" + i))[-1]
elif (platform.uname()[1]=="pcbsd" and len(glob.glob("/usr/PCBSD/local/include/" + i)) > 0): elif (os.path.isdir("/usr/PCBSD") and len(glob.glob("/usr/PCBSD/local/include/" + i)) > 0):
incdir = sorted(glob.glob("/usr/PCBSD/local/include/" + i))[-1] incdir = sorted(glob.glob("/usr/PCBSD/local/include/" + i))[-1]
else: else:
have_pkg = False have_pkg = False
@ -1629,7 +1629,7 @@ def CheckLinkerLibraryPath():
os.environ["DYLD_LIBRARY_PATH"] = builtlib os.environ["DYLD_LIBRARY_PATH"] = builtlib
# Workaround around compile issue on PCBSD # Workaround around compile issue on PCBSD
if (platform.uname()[1]=="pcbsd"): if (os.path.exists("/usr/PCBSD")):
os.environ["LD_LIBRARY_PATH"] += ":/usr/PCBSD/local/lib" os.environ["LD_LIBRARY_PATH"] += ":/usr/PCBSD/local/lib"
######################################################################## ########################################################################