diff options
| author | huceke <gimli> | 2012-09-06 14:08:35 +0200 |
|---|---|---|
| committer | huceke <gimli> | 2012-09-06 14:08:35 +0200 |
| commit | b360ef829c2fe623d78679823cd0785f64b1c0b0 (patch) | |
| tree | 4ec32a91914be09a8323ed367e686dbee53ceeab | |
| parent | 3f0d6fff5b2cf1b811f365c1970b8fd7c23f1152 (diff) | |
[pvr] fixed on arm there is no seperate PLATFORM in lib name.
| -rw-r--r-- | addons/library.xbmc.addon/libXBMC_addon.h | 21 | ||||
| -rw-r--r-- | addons/library.xbmc.gui/libXBMC_gui.h | 2 | ||||
| -rw-r--r-- | addons/library.xbmc.pvr/libXBMC_pvr.h | 2 |
3 files changed, 11 insertions, 14 deletions
diff --git a/addons/library.xbmc.addon/libXBMC_addon.h b/addons/library.xbmc.addon/libXBMC_addon.h index 75012e9aff..284ccc6e41 100644 --- a/addons/library.xbmc.addon/libXBMC_addon.h +++ b/addons/library.xbmc.addon/libXBMC_addon.h @@ -29,37 +29,34 @@ #ifdef _WIN32 // windows #include "dlfcn-win32.h" #define ADDON_DLL "\\library.xbmc.addon\\libXBMC_addon" ADDON_HELPER_EXT -#define ADDON_HELPER_PLATFORM "win32" #define ADDON_HELPER_EXT ".dll" #else #if defined(__APPLE__) // osx -#define ADDON_HELPER_PLATFORM "osx" #if defined(__POWERPC__) -#define ADDON_HELPER_ARCH "powerpc" +#define ADDON_HELPER_ARCH "powerpc-osx" #elif defined(__arm__) -#define ADDON_HELPER_ARCH "arm" +#define ADDON_HELPER_ARCH "arm-osx" #else -#define ADDON_HELPER_ARCH "x86" +#define ADDON_HELPER_ARCH "x86-osx" #endif #else // linux -#define ADDON_HELPER_PLATFORM "linux" #if defined(__x86_64__) -#define ADDON_HELPER_ARCH "x86_64" +#define ADDON_HELPER_ARCH "x86_64-linux" #elif defined(_POWERPC) -#define ADDON_HELPER_ARCH "powerpc" +#define ADDON_HELPER_ARCH "powerpc-linux" #elif defined(_POWERPC64) -#define ADDON_HELPER_ARCH "powerpc64" +#define ADDON_HELPER_ARCH "powerpc64-linux" #elif defined(__ARMEL__) #define ADDON_HELPER_ARCH "arm" #elif defined(_MIPSEL) -#define ADDON_HELPER_ARCH "mipsel" +#define ADDON_HELPER_ARCH "mipsel-linux" #else -#define ADDON_HELPER_ARCH "i486" +#define ADDON_HELPER_ARCH "i486-linux" #endif #endif #include <dlfcn.h> // linux+osx #define ADDON_HELPER_EXT ".so" -#define ADDON_DLL "/library.xbmc.addon/libXBMC_addon-" ADDON_HELPER_ARCH "-" ADDON_HELPER_PLATFORM ADDON_HELPER_EXT +#define ADDON_DLL "/library.xbmc.addon/libXBMC_addon-" ADDON_HELPER_ARCH ADDON_HELPER_EXT #endif #ifdef LOG_DEBUG diff --git a/addons/library.xbmc.gui/libXBMC_gui.h b/addons/library.xbmc.gui/libXBMC_gui.h index afde37814d..3213e53473 100644 --- a/addons/library.xbmc.gui/libXBMC_gui.h +++ b/addons/library.xbmc.gui/libXBMC_gui.h @@ -32,7 +32,7 @@ typedef void* GUIHANDLE; #ifdef _WIN32 #define GUI_HELPER_DLL "\\library.xbmc.gui\\libXBMC_gui" ADDON_HELPER_EXT #else -#define GUI_HELPER_DLL "/library.xbmc.gui/libXBMC_gui-" ADDON_HELPER_ARCH "-" ADDON_HELPER_PLATFORM ADDON_HELPER_EXT +#define GUI_HELPER_DLL "/library.xbmc.gui/libXBMC_gui-" ADDON_HELPER_ARCH ADDON_HELPER_EXT #endif #define ADDON_ACTION_PREVIOUS_MENU 10 diff --git a/addons/library.xbmc.pvr/libXBMC_pvr.h b/addons/library.xbmc.pvr/libXBMC_pvr.h index a485de302d..d308e07cf2 100644 --- a/addons/library.xbmc.pvr/libXBMC_pvr.h +++ b/addons/library.xbmc.pvr/libXBMC_pvr.h @@ -31,7 +31,7 @@ #ifdef _WIN32 #define PVR_HELPER_DLL "\\library.xbmc.pvr\\libXBMC_pvr" ADDON_HELPER_EXT #else -#define PVR_HELPER_DLL "/library.xbmc.pvr/libXBMC_pvr-" ADDON_HELPER_ARCH "-" ADDON_HELPER_PLATFORM ADDON_HELPER_EXT +#define PVR_HELPER_DLL "/library.xbmc.pvr/libXBMC_pvr-" ADDON_HELPER_ARCH ADDON_HELPER_EXT #endif #define DVD_TIME_BASE 1000000 |