Skip to content

Commit

Permalink
fixed: removed now deleted libbdnav from build system
Browse files Browse the repository at this point in the history
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@32326 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
  • Loading branch information
elupus committed Jul 30, 2010
1 parent fec80ec commit 7641b8c
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 23 deletions.
11 changes: 0 additions & 11 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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-@[email protected] \
xbmc/lib/libapetag/.libs/libapetag.a \
xbmc/lib/cmyth/libcmyth/libcmyth.a \
Expand Down Expand Up @@ -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-@[email protected] \
Expand Down
1 change: 0 additions & 1 deletion bootstrap
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 0 additions & 11 deletions configure.in
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
Expand Down

0 comments on commit 7641b8c

Please sign in to comment.