linux x86 32&64 static update by Roman_V_M

This commit is contained in:
DiMartinoXBMC committed 2015-07-30 00:14:33 +03:00
1 parent a25646b4c6
commit f2d70f3f02
9 files changed
+5 -15

No files matched your search

+1 -1
View File
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8' standalone='yes'?> <?xml version='1.0' encoding='UTF-8' standalone='yes'?>
<addon id='script.module.libtorrent' version='0.16.19b' name='LibTorrent' provider-name='DiMartino, srg70, RussakHH'> <addon id='script.module.libtorrent' version='0.16.19c' name='LibTorrent' provider-name='DiMartino, srg70, RussakHH'>
<requires> <requires>
<import addon='xbmc.python' version='2.1.0'/> <import addon='xbmc.python' version='2.1.0'/>
</requires> </requires>
+1 -3
View File
@@ -13,12 +13,10 @@ except:
def get_libname(platform): def get_libname(platform):
libname=[] libname=[]
if platform['system'] in ['darwin', 'linux_x86', 'linux_arm']: if platform['system'] in ['darwin', 'linux_x86', 'linux_arm', 'linux_x86_64']:
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_x86_64']:
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']
return libname return libname
+1 -8
View File
@@ -44,7 +44,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', 'linux_arm']: if platform['system'] in ['linux_x86', 'windows', 'linux_arm', 'linux_x86_64']:
import libtorrent import libtorrent
elif platform['system'] in ['darwin']: elif platform['system'] in ['darwin']:
import imp import imp
@@ -57,13 +57,6 @@ 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']:
from ctypes import CDLL
dll_path=os.path.join(dest_path, 'libtorrent-rasterbar.so.7')
log('CDLL path = ' + dll_path)
liblibtorrent=CDLL(dll_path)
log('CDLL = ' + str(liblibtorrent))
import libtorrent
elif platform['system'] in ['android_armv7', 'android_x86']: elif platform['system'] in ['android_armv7', 'android_x86']:
import imp import imp
from ctypes import CDLL from ctypes import CDLL
@@ -1 +1 @@
6219339 6257605
Binary file not shown.
@@ -1 +0,0 @@
2309928
@@ -1 +1 @@
1188592 6620181
Binary file not shown.