merge r35638, fixed (again), need to ref from @executable_path path or loader will...

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/Dharma@35639 568bbfeb-2a22-0410-94d2-cc84cf5bfa90

diff --git a/xbmc/DllPaths_generated.h.in b/xbmc/DllPaths_generated.h.in
index 271e20d..6ab56da 100644 (file)
--- a/xbmc/DllPaths_generated.h.in
+++ b/xbmc/DllPaths_generated.h.in
@@ -68,11 +68,12 @@
 #if defined(_LINUX) && !defined(__APPLE__)
 #define DLL_PATH_FLAC_CODEC    "@FLAC_SONAME@"
 #define DLL_PATH_MODPLUG_CODEC "@MODPLUG_SONAME@"
+#define DLL_PATH_OGG_CODEC     "@VORBISFILE_SONAME@"
 #else
 #define DLL_PATH_FLAC_CODEC    "special://xbmcbin/system/players/paplayer/libFLAC-@ARCH@.so"
 #define DLL_PATH_MODPLUG_CODEC "special://xbmcbin/system/players/paplayer/libmodplug-@ARCH@.so"
+#define DLL_PATH_OGG_CODEC     "@executable_path/../Frameworks/@VORBISFILE_SONAME@"
 #endif
-#define DLL_PATH_OGG_CODEC     "@VORBISFILE_SONAME@"
 
 /* dvdplayer */
 #define DLL_PATH_LIBASS        "special://xbmcbin/system/players/dvdplayer/libass-@ARCH@.so"
@@ -98,12 +99,15 @@
 /* cdrip */
 #if defined(_LINUX) && !defined(__APPLE__)
 #define DLL_PATH_LAME_ENC      "libmp3lame.so.0"
-#else
-#define DLL_PATH_LAME_ENC      "special://xbmcbin/system/cdrip/lame_enc-@ARCH@.so"
-#endif
 #define DLL_PATH_OGG           "@OGG_SONAME@"
 #define DLL_PATH_VORBIS_ENC    "@VORBISENC_SONAME@"
 #define DLL_PATH_VORBIS        "@VORBIS_SONAME@"
+#else
+#define DLL_PATH_LAME_ENC      "special://xbmcbin/system/cdrip/lame_enc-@ARCH@.so"
+#define DLL_PATH_OGG           "@executable_path/../Frameworks/@OGG_SONAME@"
+#define DLL_PATH_VORBIS_ENC    "@executable_path/../Frameworks/@VORBISENC_SONAME@"
+#define DLL_PATH_VORBIS        "@executable_path/../Frameworks/@VORBIS_SONAME@"
+#endif
 
 /* broadcom crystalhd */
 #if defined(_LINUX) && !defined(__APPLE__)