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

no need to use -l for libraries in built/lib

Browse Source
This commit is contained in:
rdb 2013-02-10 15:42:41 +00:00
parent c765d39a95
commit f32d62cc09
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
makepanda/makepanda.py
View File

@ -1384,14 +1384,8 @@ def CompileLink(dll, obj, opts):
cmd += ' -o ' + dll + ' -L' + GetOutputDir() + '/lib -L' + GetOutputDir() + '/tmp -L/usr/X11R6/lib' cmd += ' -o ' + dll + ' -L' + GetOutputDir() + '/lib -L' + GetOutputDir() + '/tmp -L/usr/X11R6/lib'
for x in obj: for x in obj:
if (GetOrigExt(x) != ".dat"): if GetOrigExt(x) != ".dat":
base = os.path.basename(x) cmd += ' ' + x
if (base[-3:]==".so") and (base[:3]=="lib"):
cmd += ' -l' + base[3:-3]
elif (base[-2:]==".a") and (base[:3]=="lib"):
cmd += ' -l' + base[3:-2]
else:
cmd += ' ' + x
if (GetOrigExt(dll) == ".exe" and GetTarget() == 'windows' and "NOICON" not in opts): if (GetOrigExt(dll) == ".exe" and GetTarget() == 'windows' and "NOICON" not in opts):
cmd += " " + GetOutputDir() + "/tmp/pandaIcon.res" cmd += " " + GetOutputDir() + "/tmp/pandaIcon.res"