Mercurial > mplayer.hg
changeset 7036:9a0cc1f1e37a
libmpdvdkit2 directory was not compiled - mplayer compile failed - fixed.
| author | jaf |
|---|---|
| date | Sat, 17 Aug 2002 09:34:53 +0000 |
| parents | 1efd78723952 |
| children | 3af201ee5eb0 |
| files | Makefile configure |
| diffstat | 2 files changed, 21 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Sat Aug 17 09:15:30 2002 +0000 +++ b/Makefile Sat Aug 17 09:34:53 2002 +0000 @@ -117,6 +117,13 @@ COMMON_DEPS += libmpdvdkit/libmpdvdkit.a endif endif +ifeq ($(DVDKIT2),yes) +ifeq ($(DVDKIT_SHARED),yes) +COMMON_DEPS += libmpdvdkit2/libmpdvdkit.so +else +COMMON_DEPS += libmpdvdkit2/libmpdvdkit.a +endif +endif libmpdvdkit/libmpdvdkit.a: $(MAKE) -C libmpdvdkit @@ -124,6 +131,12 @@ libmpdvdkit/libmpdvdkit.so: $(MAKE) -C libmpdvdkit libmpdvdkit.so +libmpdvdkit2/libmpdvdkit.a: + $(MAKE) -C libmpdvdkit2 + +libmpdvdkit2/libmpdvdkit.so: + $(MAKE) -C libmpdvdkit2 libmpdvdkit.so + loader/libloader.a: $(MAKE) -C loader
--- a/configure Sat Aug 17 09:15:30 2002 +0000 +++ b/configure Sat Aug 17 09:34:53 2002 +0000 @@ -3020,6 +3020,8 @@ if test -f "./libmpdvdkit2/Makefile" ; then _inputmodules="mpdvdkit2 $_inputmodules" _dvdread=libmpdvdkit2 + _dvdkit2=yes + _dvdkit=no else _inputmodules="mpdvdkit $_inputmodules" _dvdread=libmpdvdkit @@ -3039,7 +3041,11 @@ else _noinputmodules="mpdvdkit $_noinputmodules" fi -echores "$_dvdkit" +if test "$_dvdkit" = yes || test "$_dvdkit2" = yes; then + echores "yes" +else + echores "no" +fi echocheck "DVD support (libcss - old style)" if test "$_css" = auto ; then @@ -4242,6 +4248,7 @@ CSS_USE = $_css CSS_LIB = $_ld_css DVDKIT = $_dvdkit +DVDKIT2 = $_dvdkit2 DVDKIT_SHARED = no SDL_INC = $_inc_sdl W32_DEP = $_dep_win32