pull/1/head
DiMartinoXBMC 2015-07-19 18:43:49 +03:00
parent 1fe4e26b56
commit 6e807f4451
6 changed files with 5 additions and 6 deletions

View File

@ -13,11 +13,11 @@ except:
def get_libname(platform): def get_libname(platform):
libname=[] libname=[]
if platform['system'] in ['darwin', 'linux_x86']: if platform['system'] in ['darwin', 'linux_x86', 'linux_arm']:
libname=['libtorrent.so'] libname=['libtorrent.so']
elif platform['system'] == 'windows': elif platform['system'] == 'windows':
libname=['libtorrent.pyd'] libname=['libtorrent.pyd']
elif platform['system'] in ['linux_arm', 'linux_x86_64']: elif platform['system'] in ['linux_x86_64']:
libname=['libtorrent.so', 'libtorrent-rasterbar.so.7'] libname=['libtorrent.so', 'libtorrent-rasterbar.so.7']
elif platform['system'] in ['android_armv7', 'android_x86']: elif platform['system'] in ['android_armv7', 'android_x86']:
libname=['libtorrent.so', 'liblibtorrent.so'] libname=['libtorrent.so', 'liblibtorrent.so']

View File

@ -35,7 +35,7 @@ if platform['system'] not in ['windows']:
log('os: '+str(os.uname())) log('os: '+str(os.uname()))
try: try:
if platform['system'] in ['linux_x86', 'windows']: if platform['system'] in ['linux_x86', 'windows', 'linux_arm']:
import libtorrent import libtorrent
elif platform['system'] in ['darwin']: elif platform['system'] in ['darwin']:
import imp import imp
@ -48,7 +48,7 @@ try:
libtorrent = imp.load_module('libtorrent', fp, pathname, description) libtorrent = imp.load_module('libtorrent', fp, pathname, description)
finally: finally:
if fp: fp.close() if fp: fp.close()
elif platform['system'] in ['linux_x86_64', 'linux_arm']: elif platform['system'] in ['linux_x86_64']:
from ctypes import CDLL from ctypes import CDLL
dll_path=os.path.join(dest_path, 'libtorrent-rasterbar.so.7') dll_path=os.path.join(dest_path, 'libtorrent-rasterbar.so.7')
log('CDLL path = ' + dll_path) log('CDLL path = ' + dll_path)

View File

@ -1 +1 @@
1252364 2338996