pull/1/head
DiMartinoXBMC 2015-07-31 17:35:50 +03:00
parent 598dc56c09
commit 8d20a8d76d
2 changed files with 11 additions and 9 deletions

View File

@ -13,7 +13,7 @@ except:
def get_libname(platform): def get_libname(platform):
libname=[] libname=[]
if platform['system'] in ['darwin', 'linux_x86', 'linux_armv6', 'linux_armv7', 'linux_x86_64']: if platform['system'] in ['darwin', 'linux_x86', 'linux_arm', 'linux_armv6', 'linux_armv7', 'linux_x86_64']:
libname=['libtorrent.so'] libname=['libtorrent.so']
elif platform['system'] == 'windows': elif platform['system'] == 'windows':
libname=['libtorrent.pyd'] libname=['libtorrent.pyd']
@ -44,10 +44,10 @@ def get_platform():
ret["arch"] = "x64" ret["arch"] = "x64"
elif system==3: elif system==3:
ret["os"] = "linux" ret["os"] = "linux"
ret["arch"] = "arm" ret["arch"] = "armv7"
elif system==4: elif system==4:
ret["os"] = "linux" ret["os"] = "linux"
ret["arch"] = "arm" ret["arch"] = "armv6"
elif system==5: elif system==5:
ret["os"] = "android" ret["os"] = "android"
ret["arch"] = "arm" ret["arch"] = "arm"
@ -75,12 +75,14 @@ def get_platform():
ret["arch"] = "arm" ret["arch"] = "arm"
elif xbmc.getCondVisibility("system.platform.linux"): elif xbmc.getCondVisibility("system.platform.linux"):
ret["os"] = "linux" ret["os"] = "linux"
if "arm" in os.uname()[4]: uname=os.uname()[4]
ret["arch"] = "arm" if "arm" in uname:
if "arm7" in os.uname()[4]: if "armv7" in uname:
ret["arch"] = "armv7" ret["arch"] = "armv7"
elif "arm6" in os.uname()[4]: elif "armv6" in uname:
ret["arch"] = "armv6" ret["arch"] = "armv6"
else:
ret["arch"] = "arm"
elif xbmc.getCondVisibility("system.platform.windows"): elif xbmc.getCondVisibility("system.platform.windows"):
ret["os"] = "windows" ret["os"] = "windows"
elif xbmc.getCondVisibility("system.platform.osx"): elif xbmc.getCondVisibility("system.platform.osx"):

View File

@ -10,8 +10,8 @@
<string id="1100">Windows 32-bit, 64-bit</string> <string id="1100">Windows 32-bit, 64-bit</string>
<string id="1101">Linux 32-bit</string> <string id="1101">Linux 32-bit</string>
<string id="1102">Linux 64-bit (not ready)</string> <string id="1102">Linux 64-bit</string>
<string id="1103">Linux ARM v7 (RPi 2, not ready)</string> <string id="1103">Linux ARM v7 (RPi 2)</string>
<string id="1104">Linux ARM v6 (RPi, not ready)</string> <string id="1104">Linux ARM v6 (RPi, not ready)</string>
<string id="1105">Android ARM v7</string> <string id="1105">Android ARM v7</string>
<string id="1106">Android 32-bit</string> <string id="1106">Android 32-bit</string>