mirror of
https://github.com/panda3d/panda3d.git
synced 2025-09-30 16:58:40 -04:00
no need to use -l for libraries in built/lib
This commit is contained in:
parent
c765d39a95
commit
f32d62cc09
@ -1384,14 +1384,8 @@ def CompileLink(dll, obj, opts):
|
||||
cmd += ' -o ' + dll + ' -L' + GetOutputDir() + '/lib -L' + GetOutputDir() + '/tmp -L/usr/X11R6/lib'
|
||||
|
||||
for x in obj:
|
||||
if (GetOrigExt(x) != ".dat"):
|
||||
base = os.path.basename(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(x) != ".dat":
|
||||
cmd += ' ' + x
|
||||
|
||||
if (GetOrigExt(dll) == ".exe" and GetTarget() == 'windows' and "NOICON" not in opts):
|
||||
cmd += " " + GetOutputDir() + "/tmp/pandaIcon.res"
|
||||
|
Loading…
x
Reference in New Issue
Block a user