mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-01 01:07:51 -04:00
Fix bug in makepanda with linking of temporary static libraries into dynamic libraries
This commit is contained in:
parent
cd50df5693
commit
13b23ef618
@ -801,9 +801,9 @@ def CompileLink(dll, obj, opts):
|
||||
cmd = 'g++ -undefined dynamic_lookup'
|
||||
if ("BUNDLE" in opts): cmd += ' -bundle '
|
||||
else: cmd += ' -dynamiclib -install_name ' + os.path.basename(dll)
|
||||
cmd += ' -o ' + dll + ' -L' + GetOutputDir() + '/lib -L/usr/X11R6/lib'
|
||||
cmd += ' -o ' + dll + ' -L' + GetOutputDir() + '/lib -L' + GetOutputDir() + '/tmp -L/usr/X11R6/lib'
|
||||
else:
|
||||
cmd = 'g++ -shared -o ' + dll + ' -L' + GetOutputDir() + '/lib -L/usr/X11R6/lib'
|
||||
cmd = 'g++ -shared -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)
|
||||
|
Loading…
x
Reference in New Issue
Block a user