fix 64 +arm

pull/1/head
DiMartinoXBMC 2015-07-15 20:39:42 +03:00
parent cf02d31e71
commit a08becfe74
7 changed files with 8 additions and 5 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', 'linux_x86_64']: if platform['system'] in ['darwin', 'linux_x86']:
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']: elif platform['system'] in ['linux_arm', '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

@ -30,11 +30,12 @@ if __settings__.getSetting('plugin_name')!=__plugin__:
__settings__.setSetting('plugin_name', __plugin__) __settings__.setSetting('plugin_name', __plugin__)
lm.update() lm.update()
log('platform ' + str(platform)) log('platform: ' + str(platform))
log('os: '+str(os.uname()))
try: try:
if platform['system'] in ['darwin', 'linux_x86', 'windows']: if platform['system'] in ['darwin', 'linux_x86', 'windows']:
import libtorrent import libtorrent
elif platform['system'] in ['linux_x86_64']: elif platform['system'] in ['linux_x86_64', 'linux_arm']:
from ctypes import * from ctypes import *
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

@ -3,7 +3,7 @@ import os
import xbmc, xbmcgui, xbmcvfs import xbmc, xbmcgui, xbmcvfs
from net import HTTP from net import HTTP
__libbaseurl__ = "https://github.com/DiMartinoXBMC/script.module.libtorrent/raw/master/python_libtorrent/" __libbaseurl__ = "https://github.com/DiMartinoXBMC/script.module.libtorrent/raw/master/python_libtorrent"
__scriptname__ = "script.module.libtorrent" __scriptname__ = "script.module.libtorrent"
__icon__=os.path.join(xbmc.translatePath('special://home'), 'addons', __icon__=os.path.join(xbmc.translatePath('special://home'), 'addons',
'script.module.libtorrent', 'icon.png') 'script.module.libtorrent', 'icon.png')

View File

@ -0,0 +1 @@
2682776

View File

@ -0,0 +1 @@
1252364

Binary file not shown.