Explorar o código

Merge branch 'master' into invalid-texture-coordinates-cleaning-fix

Kim Kulling %!s(int64=7) %!d(string=hai) anos
pai
achega
ce7f379aa3
Modificáronse 1 ficheiros con 3 adicións e 0 borrados
  1. 3 0
      port/PyAssimp/pyassimp/helper.py

+ 3 - 0
port/PyAssimp/pyassimp/helper.py

@@ -30,6 +30,9 @@ if os.name=='posix':
     additional_dirs.append('/usr/lib/x86_64-linux-gnu')
     additional_dirs.append('/usr/lib/x86_64-linux-gnu')
     additional_dirs.append('/usr/local/lib/')
     additional_dirs.append('/usr/local/lib/')
 
 
+    if 'LD_LIBRARY_PATH' in os.environ:
+        additional_dirs.extend([item for item in os.environ['LD_LIBRARY_PATH'].split(':') if item])
+
     # check if running from anaconda.
     # check if running from anaconda.
     if "conda" or "continuum" in sys.version.lower():
     if "conda" or "continuum" in sys.version.lower():
       cur_path = get_python_lib()
       cur_path = get_python_lib()