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

fix for --outputdir from peci

Browse Source
This commit is contained in:
David Rose 2009-04-20 19:36:16 +00:00
parent 850202bb9d
commit 1f06255489
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
makepanda/makepanda.py
View File

@ -653,15 +653,15 @@ def CompileLink(dll, obj, opts):
cmd = cmd + " /FIXED:NO /OPT:REF /STACK:4194304 /INCREMENTAL:NO "
cmd = cmd + ' /OUT:' + dll
if (dll.endswith(".dll")):
cmd = cmd + ' /IMPLIB:' + GetOutputDir() + '/lib/'+dll[10:-4]+".lib"
cmd = cmd + ' /IMPLIB:' + GetOutputDir() + '/lib/'+dll[len(GetOutputDir()+"/bin/"):-4]+".lib"
for (opt, dir) in LIBDIRECTORIES:
if (opt=="ALWAYS") or (opts.count(opt)): cmd = cmd + ' /LIBPATH:"' + dir + '"'
for x in obj:
if (x.endswith(".dll")):
cmd = cmd + ' ' + GetOutputDir() + '/lib/' + x[10:-4] + ".lib"
cmd = cmd + ' ' + GetOutputDir() + '/lib/' + x[len(GetOutputDir()+"/bin/"):-4] + ".lib"
elif (x.endswith(".lib")):
dname = x[:-4]+".dll"
if (os.path.exists(GetOutputDir()+"/bin/" + x[10:-4] + ".dll")):
if (os.path.exists(GetOutputDir()+"/bin/" + x[len(GetOutputDir()+"/bin/"):-4] + ".dll")):
exit("Error: in makepanda, specify "+dname+", not "+x)
cmd = cmd + ' ' + x
elif (x.endswith(".def")):