created a python3 version of the 3dviewer and fixed the / = float in py3

pull/1401/head
Mel Massadian 2017-08-23 20:02:58 +02:00
parent 91f6a9a721
commit 37f5619149
2 changed files with 1353 additions and 21 deletions

View File

@ -9,6 +9,10 @@ import ctypes
from ctypes import POINTER from ctypes import POINTER
import operator import operator
from distutils.sysconfig import get_python_lib
import re
import sys
try: import numpy try: import numpy
except: numpy = None except: numpy = None
@ -26,6 +30,14 @@ 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/')
# check if running from anaconda.
if "conda" or "continuum" in sys.version.lower():
cur_path = get_python_lib()
pattern = re.compile('.*\/lib\/')
conda_lib = pattern.match(cur_path).group()
logger.info("Adding Anaconda lib path:"+ conda_lib)
additional_dirs.append(conda_lib)
# note - this won't catch libassimp.so.N.n, but # note - this won't catch libassimp.so.N.n, but
# currently there's always a symlink called # currently there's always a symlink called
# libassimp.so in /usr/local/lib. # libassimp.so in /usr/local/lib.

File diff suppressed because it is too large Load Diff