From fa04d77b5754543729eaece06e32b93222f06585 Mon Sep 17 00:00:00 2001 From: rdb Date: Sun, 20 Dec 2020 01:11:46 +0100 Subject: [PATCH] makepanda: Replace use of deleted GetThirdpartyLibDir function This caused a build error due to a faulty auto-merge. --- makepanda/makepanda.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index 6e04f20076..9648937ad7 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -2843,7 +2843,7 @@ if tp_dir is not None: if PkgSkip(pkg): continue - tp_libdir = GetThirdpartyLibDir(pkg) + tp_libdir = os.path.join(tp_dir, pkg.lower(), "lib") for lib in glob.glob(os.path.join(tp_libdir, "*.dylib")): dylibs[os.path.basename(lib)] = os.path.basename(os.path.realpath(lib)) @@ -2863,7 +2863,7 @@ if tp_dir is not None: CopyAllFiles(GetOutputDir() + "/bin/", tp_pkg + "/bin/" + SDK["PYTHONVERSION"] + "/") elif GetTarget() == 'darwin': - tp_libdir = GetThirdpartyLibDir(pkg) + tp_libdir = os.path.join(tp_pkg, "lib") tp_libs = glob.glob(os.path.join(tp_libdir, "*.dylib")) if not PkgSkip("PYTHON"):