mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-04 02:42:49 -04:00
Fixed a dependency problem in makepanda
This commit is contained in:
parent
204c6c2872
commit
0ca35954bb
@ -1350,6 +1350,11 @@ def CompileLink(dll, obj, opts, ldef):
|
||||
if (OMIT.count("PYTHON")==0): cmd = cmd + ' /LIBPATH:thirdparty/win-python/libs '
|
||||
for x in obj:
|
||||
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,[])
|
||||
if (wdll[-4:]==".exe"): cmd = cmd + ' panda/src/configfiles/pandaIcon.obj'
|
||||
for ver in DXVERSIONS:
|
||||
@ -4188,7 +4193,7 @@ for VER in MAYAVERSIONS:
|
||||
EnqueueLink(dll='libp3mayaloader'+VER+'.dll', opts=['ADVAPI', 'MAYA'+VER], obj=[
|
||||
'mayaloader'+VER+'_config_mayaloader.obj',
|
||||
'libmayaegg'+VER+'.lib',
|
||||
'libp3ptloader.lib',
|
||||
'libp3ptloader.dll',
|
||||
'libconverter.lib',
|
||||
'libpandatoolbase.lib',
|
||||
'libmaya'+VER+'.lib',
|
||||
|
Loading…
x
Reference in New Issue
Block a user