Use libass from external dependencies

diff --git a/project/BuildDependencies/scripts/0_package.list b/project/BuildDependencies/scripts/0_package.list
index 35302eb..948fee0 100644 (file)
--- a/project/BuildDependencies/scripts/0_package.list
+++ b/project/BuildDependencies/scripts/0_package.list
@@ -10,6 +10,7 @@ dnssd-379.32.1-win32.7z
 doxygen-1.8.2-win32.7z
 gnutls-3.2.3-win32.zip
 lame_enc-3.99.5-win32.7z
+libass-0.10.2-win32.7z
 libbluray-0.4.0-win32.zip
 libjpeg-turbo-1.2.0-win32.7z
 libnfs-1.6.1-win32.7z

diff --git a/xbmc/cores/dvdplayer/DVDSubtitles/DllLibass.h b/xbmc/cores/dvdplayer/DVDSubtitles/DllLibass.h
index 9aed3c6..4a3cd76 100644 (file)
--- a/xbmc/cores/dvdplayer/DVDSubtitles/DllLibass.h
+++ b/xbmc/cores/dvdplayer/DVDSubtitles/DllLibass.h
@@ -24,11 +24,7 @@
   #include "config.h"
 #endif
 extern "C" {
-#if defined(TARGET_WINDOWS)
-  #include "lib/libass/libass/ass.h"
-#else
   #include <ass/ass.h>
-#endif
 }
 #include "DynamicDll.h"
 #include "utils/log.h"