diff options
| author | Chris "koying" Browet <cbro@semperpax.com> | 2013-07-27 11:44:00 +0200 |
|---|---|---|
| committer | Chris "Koying" Browet <cbro@semperpax.com> | 2013-11-06 11:42:53 +0100 |
| commit | 4d2ff16b2353dce6688ee5a135fe2d2fc2643617 (patch) | |
| tree | d9c96dbbf41980b18417ce9ff209746d7d6be7f3 /Makefile.in | |
| parent | 45a50dae90aef16fd2cac3823ca230841628d8d7 (diff) | |
FIX: [stagefright] dyload the whole codec to prevent potential future api breakage
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in index 72acd89b17..76d6396386 100644 --- a/Makefile.in +++ b/Makefile.in @@ -14,7 +14,11 @@ XBMCTEX_DIRS= \ DVDPCODECS_DIRS= \ lib \ - lib/libdvd + lib/libdvd + +ifeq (@USE_LIBSTAGEFRIGHT@,1) +DVDPCODECS_DIRS += xbmc/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS +endif DVDPLAYER_ARCHIVES=xbmc/cores/dvdplayer/DVDPlayer.a \ xbmc/cores/dvdplayer/DVDCodecs/DVDCodecs.a \ @@ -329,7 +333,7 @@ all : $(FINAL_TARGETS) include Makefile.include .PHONY : dllloader exports visualizations screensavers eventclients papcodecs \ - dvdpcodecs imagelib codecs externals force skins libaddon check \ + dvdpcodecs dvdpextcodecs imagelib codecs externals force skins libaddon check \ testframework testsuite # hack targets to keep build system up to date @@ -402,6 +406,14 @@ libaddon: exports dvdpcodecs: dllloader $(MAKE) -C lib $(MAKE) -C lib/libdvd + +ifeq (@USE_LIBSTAGEFRIGHT@,1) +dvdpextcodecs: libxbmc.so + $(MAKE) -C xbmc/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS +else +dvdpextcodecs: +endif + eventclients: ifeq ($(findstring osx,@ARCH@), osx) ifneq ($(findstring arm,@ARCH@), arm) @@ -442,7 +454,7 @@ ifeq (@USE_PVR_ADDONS@,1) $(MAKE) -C pvr-addons endif -codecs: papcodecs dvdpcodecs +codecs: papcodecs dvdpcodecs dvdpextcodecs libs: libhdhomerun imagelib libexif system/libcpluff-@ARCH@.so $(CMYTH) |