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

Minor fixes

Browse Source
This commit is contained in:
rdb 2009-07-20 08:57:24 +00:00
parent 64cd2984ee
commit bc647ff264
2 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
makepanda/makepanda.py
View File

@ -2776,17 +2776,6 @@ if (PkgSkip("PYTHON")==0):
OPTS=['DIR:direct/src/directbase', 'BUILDING:DIRECT']
TargetAdd('directbase_directbase.obj', opts=OPTS, input='directbase.cxx')
#
# Freeze whatever we need to freeze.
#
if (PkgSkip("PYTHON")==0):
if (sys.platform == "darwin" or sys.platform.startswith("win") or ("PYTHONVERSION" in SDK and SDK["PYTHONVERSION"] == "python2.6")):
TargetAdd('runp3d.exe', input='direct/src/showutil/runp3d.py')
TargetAdd('packp3d.exe', input='direct/src/showutil/packp3d.py')
TargetAdd('packpanda.exe', input='direct/src/directscripts/packpanda.py')
TargetAdd('eggcacher.exe', input='direct/src/directscripts/eggcacher.py')
#
# DIRECTORY: direct/src/dcparser/
#
@ -3764,6 +3753,17 @@ if (PkgSkip("PYTHON")==0):
if (PkgSkip("ODE")==0):
TargetAdd('PandaModules.py', input='libpandaode.dll')
#
# Freeze whatever we need to freeze.
#
if (PkgSkip("PYTHON")==0):
if (sys.platform == "darwin" or sys.platform.startswith("win") or ("PYTHONVERSION" in SDK and SDK["PYTHONVERSION"] == "python2.6")):
TargetAdd('runp3d.exe', input='direct/src/showutil/runp3d.py')
TargetAdd('packp3d.exe', input='direct/src/showutil/packp3d.py')
TargetAdd('packpanda.exe', input='direct/src/directscripts/packpanda.py')
TargetAdd('eggcacher.exe', input='direct/src/directscripts/eggcacher.py')
#
# Generate the models directory and samples directory
#

10
makepanda/makepandacore.py
View File

@ -111,7 +111,7 @@ def oscmd(cmd, ignoreError = False):
print cmd
sys.stdout.flush()
if sys.platform == "win32":
exe = cmd.split[0]
exe = cmd.split()[0]
if not (len(exe) > 4 and exe[-4:] == ".exe"):
exe += ".exe"
if os.path.isfile(exe)==0:
@ -1069,6 +1069,14 @@ def CheckLinkerLibraryPath():
if (sys.platform == "darwin" and os.environ.has_key("DYLD_LIBRARY_PATH")):
dyldpath = os.environ["DYLD_LIBRARY_PATH"].split(":")
# Remove any potential current Panda installation lib dirs
for i in ldpath:
if i.startswith("/usr/lib/panda"): ldpath.remove(i)
for i in ldpath:
if i.startswith("/usr/local/panda"): ldpath.remove(i)
for i in dyldpath:
if i.startswith("/Applications/Panda3D"): dyldpath.remove(i)
# Add built/lib/ to (DY)LD_LIBRARY_PATH if it's not already there
if (ldpath.count(builtlib)==0):
if (os.environ.has_key("LD_LIBRARY_PATH")):