diff options
| author | Cory Fields <theuni-nospam-@xbmc.org> | 2012-12-01 00:37:07 -0500 |
|---|---|---|
| committer | Cory Fields <theuni-nospam-@xbmc.org> | 2012-12-01 00:39:13 -0500 |
| commit | b85aa19d95ccfb037bf7707ce61a25a7e6aafa9a (patch) | |
| tree | 82f0ce43c209af53f7d51679a1a8eeed619be80b | |
| parent | eabf43282e3bb3132dea7c5275d614e65038d640 (diff) | |
addons: add missing definitions for filtering binary addons
| -rw-r--r-- | addons/xbmc.addon/metadata.xsd | 3 | ||||
| -rw-r--r-- | xbmc/addons/AddonManager.cpp | 8 |
2 files changed, 10 insertions, 1 deletions
diff --git a/addons/xbmc.addon/metadata.xsd b/addons/xbmc.addon/metadata.xsd index fa6791b79f..6ae6d6c18d 100644 --- a/addons/xbmc.addon/metadata.xsd +++ b/addons/xbmc.addon/metadata.xsd @@ -33,6 +33,9 @@ <xs:restriction base="xs:string"> <xs:enumeration value="linux"/> <xs:enumeration value="osx"/> + <xs:enumeration value="osx64"/> + <xs:enumeration value="osx32"/> + <xs:enumeration value="ios"/> <xs:enumeration value="wingl"/> <xs:enumeration value="windx"/> <xs:enumeration value="android"/> diff --git a/xbmc/addons/AddonManager.cpp b/xbmc/addons/AddonManager.cpp index 29181c19ee..5153f5dbbe 100644 --- a/xbmc/addons/AddonManager.cpp +++ b/xbmc/addons/AddonManager.cpp @@ -651,7 +651,13 @@ bool CAddonMgr::PlatformSupportsAddon(const cp_plugin_info_t *plugin) const #elif defined(_WIN32) && defined(HAS_DX) if (platforms[i] == "windx") #elif defined(TARGET_DARWIN_OSX) - if (platforms[i] == "osx") +// Remove this after Frodo and add an architecture filter +// in addition to platform. +#if defined(__x86_64__) + if (platforms[i] == "osx64" || platforms[i] == "osx") +#else + if (platforms[i] == "osx32" || platforms[i] == "osx") +#endif #elif defined(TARGET_DARWIN_IOS) if (platforms[i] == "ios") #endif |