v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1298 from severin-lemaignan/master 

Revert "Installing assimp library as well"
pull/1302/head^2
Kim Kulling 2017-06-07 14:41:52 +02:00 committed by GitHub
parent 30e88af520 4d37f90ea5
commit ea61e8bc5b
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
port/PyAssimp/pyassimp/helper.py
View File

@ -8,7 +8,6 @@ import os
import ctypes import ctypes
from ctypes import POINTER from ctypes import POINTER
import operator import operator
import sys
try: import numpy try: import numpy
except: numpy = None except: numpy = None
@ -40,9 +39,7 @@ elif os.name=='nt':
for dir_candidate in path_dirs: for dir_candidate in path_dirs:
if 'assimp' in dir_candidate.lower(): if 'assimp' in dir_candidate.lower():
additional_dirs.append(dir_candidate) additional_dirs.append(dir_candidate)
additional_dirs += sys.path
#print(additional_dirs) #print(additional_dirs)
def vec2tuple(x): def vec2tuple(x):
""" Converts a VECTOR3D to a Tuple """ """ Converts a VECTOR3D to a Tuple """

4
port/PyAssimp/setup.py
View File

@ -9,7 +9,5 @@ setup(name='pyassimp',
url='https://github.com/assimp/assimp', url='https://github.com/assimp/assimp',
packages=['pyassimp'], packages=['pyassimp'],
data_files=[('share/pyassimp', ['README.md']), data_files=[('share/pyassimp', ['README.md']),
('share/examples/pyassimp', ['scripts/' + f for f in os.listdir('scripts/')]), ('share/examples/pyassimp', ['scripts/' + f for f in os.listdir('scripts/')])], requires=['numpy']
('lib/', [f for f in os.listdir('../../lib') if os.path.isfile(f)])],
requires=['numpy']
) )