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

Fixed a dependency problem in makepanda

Browse Source
This commit is contained in:
Josh Yelon 2007-10-05 22:21:33 +00:00
parent 204c6c2872
commit 0ca35954bb
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
doc/makepanda/makepanda.py
View File

@ -1350,6 +1350,11 @@ def CompileLink(dll, obj, opts, ldef):
if (OMIT.count("PYTHON")==0): cmd = cmd + ' /LIBPATH:thirdparty/win-python/libs ' if (OMIT.count("PYTHON")==0): cmd = cmd + ' /LIBPATH:thirdparty/win-python/libs '
for x in obj: for x in obj:
if (x.endswith(".dll")): cmd = cmd + ' built/lib/' + x[:-4] + ".lib" if (x.endswith(".dll")): cmd = cmd + ' built/lib/' + x[:-4] + ".lib"
elif (x.endswith(".lib")):
dname = x[:-4]+".dll"
if (os.path.exists("built/bin/" + x[:-4] + ".dll")):
exit("Error: in makepanda, specify "+dname+", not "+x)
cmd = cmd + ' ' + FindLocation(x,[])
else: cmd = cmd + ' ' + FindLocation(x,[]) else: cmd = cmd + ' ' + FindLocation(x,[])
if (wdll[-4:]==".exe"): cmd = cmd + ' panda/src/configfiles/pandaIcon.obj' if (wdll[-4:]==".exe"): cmd = cmd + ' panda/src/configfiles/pandaIcon.obj'
for ver in DXVERSIONS: for ver in DXVERSIONS:
@ -4188,7 +4193,7 @@ for VER in MAYAVERSIONS:
EnqueueLink(dll='libp3mayaloader'+VER+'.dll', opts=['ADVAPI', 'MAYA'+VER], obj=[ EnqueueLink(dll='libp3mayaloader'+VER+'.dll', opts=['ADVAPI', 'MAYA'+VER], obj=[
'mayaloader'+VER+'_config_mayaloader.obj', 'mayaloader'+VER+'_config_mayaloader.obj',
'libmayaegg'+VER+'.lib', 'libmayaegg'+VER+'.lib',
'libp3ptloader.lib', 'libp3ptloader.dll',
'libconverter.lib', 'libconverter.lib',
'libpandatoolbase.lib', 'libpandatoolbase.lib',
'libmaya'+VER+'.lib', 'libmaya'+VER+'.lib',