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

Fix bug in makepanda with linking of temporary static libraries into dynamic libraries

Browse Source
This commit is contained in:
rdb 2009-10-26 15:41:21 +00:00
parent cd50df5693
commit 13b23ef618
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
makepanda/makepanda.py
View File

@ -801,9 +801,9 @@ def CompileLink(dll, obj, opts):
cmd = 'g++ -undefined dynamic_lookup' cmd = 'g++ -undefined dynamic_lookup'
if ("BUNDLE" in opts): cmd += ' -bundle ' if ("BUNDLE" in opts): cmd += ' -bundle '
else: cmd += ' -dynamiclib -install_name ' + os.path.basename(dll) 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: 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: for x in obj:
if (GetOrigExt(x) != ".dat"): if (GetOrigExt(x) != ".dat"):
base = os.path.basename(x) base = os.path.basename(x)