diff options
| author | elupus <elupus@svn> | 2010-07-27 22:34:14 +0000 |
|---|---|---|
| committer | elupus <elupus@svn> | 2010-07-27 22:34:14 +0000 |
| commit | 8491e905ea1779db661498b9bc1ed98f4ade4d45 (patch) | |
| tree | 2372c1c04104c40f4d739734aa109c54d48f032b /guilib | |
| parent | a94b0cebb6d9c4c85c0121024f11b5d77ee6bf3d (diff) | |
added: support for using libbluray to play bdmv files (index.bdmv or *.mpls)
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@32232 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
Diffstat (limited to 'guilib')
| -rw-r--r-- | guilib/system.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/guilib/system.h b/guilib/system.h index 70467da782..ac01324ac9 100644 --- a/guilib/system.h +++ b/guilib/system.h @@ -224,6 +224,12 @@ #define HAS_GLES 1 #endif +// libbdnav conflicts with libbluray +#ifdef HAVE_LIBBLURAY +#undef HAS_LIBBDNAV +#endif + + #ifdef HAS_GL #ifdef _WIN32 #include "GL/glew.h" |