Permalink
Browse files

[droid] Create setting for addon path for android

  • Loading branch information...
1 parent c6031e9 commit f17a646139112c36708b5e80f56c1990333f3bd5 Cory Fields committed Jul 17, 2012
Showing with 7 additions and 2 deletions.
  1. +3 −1 xbmc/addons/AddonDll.h
  2. +4 −1 xbmc/addons/AddonManager.cpp
View
@@ -84,7 +84,9 @@ CAddonDll<TheDll, TheStruct, TheProps>::CAddonDll(const cp_extension_t *ext)
// if library attribute isn't present, look for a system-dependent one
if (ext && m_strLibName.IsEmpty())
{
-#if defined(_LINUX) && !defined(TARGET_DARWIN)
+#if defined(TARGET_ANDROID)
+ m_strLibName = CAddonMgr::Get().GetExtValue(ext->configuration, "@library_android");
+#elif defined(_LINUX) && !defined(TARGET_DARWIN)
m_strLibName = CAddonMgr::Get().GetExtValue(ext->configuration, "@library_linux");
#elif defined(_WIN32) && defined(HAS_SDL_OPENGL)
m_strLibName = CAddonMgr::Get().GetExtValue(ext->configuration, "@library_wingl");
@@ -122,7 +122,10 @@ AddonPtr CAddonMgr::Factory(const cp_extension_t *props)
if (URIUtils::GetExtension(library).Equals(".py", false))
return AddonPtr(new CScreenSaver(props));
}
-#if defined(_LINUX) && !defined(TARGET_DARWIN)
+#if defined(TARGET_ANDROID)
+ if ((value = GetExtValue(props->plugin->extensions->configuration, "@library_android")) && value.empty())
+ break;
+ #elif defined(_LINUX) && !defined(TARGET_DARWIN)
if ((value = GetExtValue(props->plugin->extensions->configuration, "@library_linux")) && value.empty())
break;
#elif defined(_WIN32) && defined(HAS_SDL_OPENGL)

0 comments on commit f17a646

Please sign in to comment.