TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-29 00:06:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

makepanda: Replace use of deleted GetThirdpartyLibDir function

Browse Source 
This caused a build error due to a faulty auto-merge.
This commit is contained in:
rdb 2020-12-20 01:11:46 +01:00
parent e08282003b
commit fa04d77b57
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

@ -2843,7 +2843,7 @@ if tp_dir is not None:
if PkgSkip(pkg): if PkgSkip(pkg):
continue 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")): for lib in glob.glob(os.path.join(tp_libdir, "*.dylib")):
dylibs[os.path.basename(lib)] = os.path.basename(os.path.realpath(lib)) 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"] + "/") CopyAllFiles(GetOutputDir() + "/bin/", tp_pkg + "/bin/" + SDK["PYTHONVERSION"] + "/")
elif GetTarget() == 'darwin': 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")) tp_libs = glob.glob(os.path.join(tp_libdir, "*.dylib"))
if not PkgSkip("PYTHON"): if not PkgSkip("PYTHON"):