RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix error

This commit is contained in:
rdb 2013-01-28 19:32:41 +00:00
parent 3a665c6e2f
commit f66c8023f9
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
makepanda/makepandacore.py
View File

@ -2205,7 +2205,7 @@ def SetupBuildEnvironment(compiler):
if GetHost() != 'windows':
# Get the current
ldpath = os.environ.get("LD_LIBRARY_PATH", "").split(os.pathsep)
if (GetHost() == 'darwin'):
if GetHost() == 'darwin':
dyldpath = os.environ.get("DYLD_LIBRARY_PATH", "").split(os.pathsep)
# Remove any potential current Panda installation lib dirs
@ -2214,10 +2214,11 @@ def SetupBuildEnvironment(compiler):
i.startswith("/usr/local/panda"):
ldpath.remove(i)
for i in dyldpath[:]:
if i.startswith("/Applications/Panda3D") or \
i.startswith("/Developer/Panda3D"):
dyldpath.remove(i)
if GetHost() == 'darwin':
for i in dyldpath[:]:
if i.startswith("/Applications/Panda3D") or \
i.startswith("/Developer/Panda3D"):
dyldpath.remove(i)
# Add built/lib/ to (DY)LD_LIBRARY_PATH
ldpath.insert(0, os.path.join(builtdir, 'lib'))