Mercurial > mplayer.hg

changeset 20509:fd92e89d0a4e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make libmpdvdkit2 compilation slightly more consistent with the other modules.
author diego
date Mon, 30 Oct 2006 08:28:58 +0000
parents f74eb19ac068
children 4970c04f6a49
files Makefile configure
diffstat 2 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Sun Oct 29 22:02:10 2006 +0000
+++ b/Makefile	Mon Oct 30 08:28:58 2006 +0000
@@ -249,6 +249,7 @@
 endif
 ifeq ($(DVDKIT2),yes)
 COMMON_DEPS += libmpdvdkit2/libmpdvdkit.a
+COMMON_LIBS += libmpdvdkit2/libmpdvdkit.a
 endif
 ifeq ($(CONFIG_ASS),yes)
 COMMON_DEPS += libass/libass.a
--- a/configure	Sun Oct 29 22:02:10 2006 +0000
+++ b/configure	Mon Oct 30 08:28:58 2006 +0000
@@ -5253,7 +5253,6 @@
   libmpdvdkit2)
 	_largefiles=yes
 	_def_dvdread='#define USE_DVDREAD 1'
-	_ld_dvdread='-Llibmpdvdkit2 -lmpdvdkit'
 	_noinputmodules="dvdread $_noinputmodules"
 	_def_mpdvdkit="#define USE_MPDVDKIT 2"
 	_have_dvd=yes