diff options
| -rw-r--r-- | Makefile.in | 11 | ||||
| -rwxr-xr-x | bootstrap | 1 | ||||
| -rw-r--r-- | configure.in | 11 |
3 files changed, 0 insertions, 23 deletions
diff --git a/Makefile.in b/Makefile.in index c0c01a658a..5b9091e753 100644 --- a/Makefile.in +++ b/Makefile.in @@ -62,10 +62,6 @@ DVDPCODECS_DIRS= \ xbmc/cores/dvdplayer/Codecs \ xbmc/cores/dvdplayer/Codecs/libdvd \ -ifneq (@HAVE_LIBBLURAY@,1) -DVDPCODECS_DIRS+=xbmc/cores/dvdplayer/Codecs/libbdnav -endif - ifneq (@USE_EXTERNAL_LIBASS@,1) DVDPCODECS_DIRS+=lib/libass/xbmc endif @@ -272,8 +268,6 @@ xbmc/utils/utils.a: force $(MAKE) -C xbmc/utils xbmc/osx/osx.a: force $(MAKE) -C xbmc/osx -xbmc/cores/dvdplayer/Codecs/libbdnav/src/libbdnav/.libs/libbdnav.a: force - $(MAKE) -C xbmc/cores/dvdplayer/Codecs/libbdnav xbmc/lib/libapetag/.libs/libapetag.a: force $(MAKE) -C xbmc/lib/libapetag lib/cpluff/libcpluff/.libs/libcpluff.a: force @@ -383,7 +377,6 @@ externals: codecs libs python visualizations screensavers xcode_depends: \ codecs libs python visualizations screensavers eventclients skins \ - xbmc/cores/dvdplayer/Codecs/libbdnav/src/libbdnav/.libs/libbdnav.a \ xbmc/lib/libsquish/libsquish-@ARCH@.a \ xbmc/lib/libapetag/.libs/libapetag.a \ xbmc/lib/cmyth/libcmyth/libcmyth.a \ @@ -441,10 +434,6 @@ OBJSXBMC= \ lib/xbmc-dll-symbols/dll-symbols.a \ xbmc/settings/settings.a -ifneq (@HAVE_LIBBLURAY@,1) -OBJSXBMC+= xbmc/cores/dvdplayer/Codecs/libbdnav/src/libbdnav/.libs/libbdnav.a -endif - ifeq (@HAVE_XBMC_NONFREE@,1) OBJSXBMC+= \ xbmc/lib/libXBMS/libxbms-@ARCH@.a \ @@ -6,7 +6,6 @@ autoreconf -vif autoreconf -vif lib/cpluff # we must autoreconf libass as we don't know till later if it's used. autoreconf -vif lib/libass -autoreconf -vif xbmc/cores/dvdplayer/Codecs/libbdnav # order matters with libbdnav and friends [ -d xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss ] && \ autoreconf -vif xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss diff --git a/configure.in b/configure.in index 299cb59922..c30896863a 100644 --- a/configure.in +++ b/configure.in @@ -1906,17 +1906,6 @@ if expr "X$host_cpu" : 'Xarm.*' > /dev/null; then :; else fi ], [0]) -XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libbdnav/], [ - if test "$host_vendor" = "apple" ; then - ./configure --with-ssl-dir=/opt/local/include CFLAGS="$CFLAGS" - else - ./configure --without-openssl \ - --host=$host_alias \ - --build=$build_alias \ - --target=$target_alias CFLAGS="$CFLAGS" - fi -], [0]) - XB_CONFIG_MODULE([xbmc/lib/libapetag], [ if test "$host_vendor" = "apple" ; then CFLAGS="$CFLAGS -fno-common" \ |