Prechádzať zdrojové kódy

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

rdb 16 rokov pred
rodič
commit
13b23ef618
1 zmenil súbory, kde vykonal 2 pridanie a 2 odobranie
  1. 2 2
      makepanda/makepanda.py

+ 2 - 2
makepanda/makepanda.py

@@ -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)