From 5670afd5fd7b2cd1a6dede462416f0ee2c4e76df Mon Sep 17 00:00:00 2001 From: rdb Date: Thu, 23 Jul 2009 12:59:57 +0000 Subject: [PATCH] No -install_name with -dynamiclib --- makepanda/makepanda.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index 34867fe7c2..9f827f4fec 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -801,10 +801,10 @@ def CompileLink(dll, obj, opts): if (GetOrigExt(dll)==".exe"): cmd = 'g++ -o ' + dll + ' -L' + GetOutputDir() + '/lib -L/usr/X11R6/lib' else: if (sys.platform == "darwin"): - cmd = 'g++ -undefined dynamic_lookup ' - if ("BUNDLE" in opts): cmd += '-bundle ' - else: cmd += '-dynamiclib ' - cmd += '-o ' + dll + ' -install_name ' + os.path.basename(dll) + ' -L' + GetOutputDir() + '/lib -L/usr/X11R6/lib' + 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' else: cmd = 'g++ -shared -o ' + dll + ' -L' + GetOutputDir() + '/lib -L/usr/X11R6/lib' for x in obj: