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

dist: fix location of numpy/Pillow shared libraries

Browse Source 
Fixes #914
This commit is contained in:
rdb 2020-06-29 11:58:00 +02:00
parent 8d99f38aa2
commit d659a3b0ff
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
direct/src/dist/commands.py vendored
View File

@ -674,12 +674,16 @@ class build_apps(setuptools.Command):
rootdir = wf.split(os.path.sep, 1)[0] rootdir = wf.split(os.path.sep, 1)[0]
search_path.append(os.path.join(whl, rootdir, '.libs')) search_path.append(os.path.join(whl, rootdir, '.libs'))
# Also look for eg. numpy.libs or Pillow.libs in the root
whl_name = os.path.basename(whl).split('-', 1)[0]
search_path.append(os.path.join(whl, whl_name + '.libs'))
# Also look for more specific per-package cases, defined in # Also look for more specific per-package cases, defined in
# PACKAGE_LIB_DIRS at the top of this file. # PACKAGE_LIB_DIRS at the top of this file.
whl_name = os.path.basename(whl).split('-', 1)[0]
extra_dirs = PACKAGE_LIB_DIRS.get(whl_name, []) extra_dirs = PACKAGE_LIB_DIRS.get(whl_name, [])
for extra_dir in extra_dirs: for extra_dir in extra_dirs:
search_path.append(os.path.join(whl, extra_dir.replace('/', os.path.sep))) search_path.append(os.path.join(whl, extra_dir.replace('/', os.path.sep)))
return search_path return search_path
def create_runtime(appname, mainscript, use_console): def create_runtime(appname, mainscript, use_console):