Mercurial > mplayer.hg

diff Makefile @ 28245:83266d299072

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Switch internal dvdread to libdvdread SVN external.
author reimar
date Thu, 08 Jan 2009 19:28:28 +0000
parents fb25bd1b00c6
children cd79547b7467
line wrap: on
line diff
--- a/Makefile	Wed Jan 07 16:39:56 2009 +0000
+++ b/Makefile	Thu Jan 08 19:28:28 2009 +0000
@@ -236,15 +236,15 @@
 SRCS_COMMON-$(DVDNAV)                += stream/stream_dvdnav.c
 SRCS_COMMON-$(DVDREAD)               += stream/stream_dvd.c \
                                         stream/stream_dvd_common.c
-SRCS_COMMON-$(DVDREAD_INTERNAL)      += libdvdread/cmd_print.c \
-                                        libdvdread/dvd_input.c \
-                                        libdvdread/dvd_reader.c \
-                                        libdvdread/dvd_udf.c \
-                                        libdvdread/ifo_print.c \
-                                        libdvdread/ifo_read.c \
-                                        libdvdread/md5.c \
-                                        libdvdread/nav_print.c \
-                                        libdvdread/nav_read.c \
+SRCS_COMMON-$(DVDREAD_INTERNAL)      += libdvdread4/bitreader.c \
+                                        libdvdread4/dvd_input.c \
+                                        libdvdread4/dvd_reader.c \
+                                        libdvdread4/dvd_udf.c \
+                                        libdvdread4/ifo_print.c \
+                                        libdvdread4/ifo_read.c \
+                                        libdvdread4/md5.c \
+                                        libdvdread4/nav_print.c \
+                                        libdvdread4/nav_read.c \
 
 SRCS_COMMON-$(FAAD)                  += libmpcodecs/ad_faad.c
 SRCS_COMMON-$(FAAD_INTERNAL)         += libfaad2/bits.c \
@@ -733,7 +733,7 @@
         libavformat \
         libavutil \
         libdvdcss \
-        libdvdread \
+        libdvdread4 \
         libfaad2 \
         libmenu \
         libmpcodecs \
@@ -839,7 +839,7 @@
 $(DEPS): help_mp.h
 
 libdvdcss/%.o libdvdcss/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.9\" $(CFLAGS_LIBDVDCSS)
-libdvdread/%.o libdvdread/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H $(CFLAGS_LIBDVDCSS_DVDREAD)
+libdvdread4/%.o libdvdread4/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H $(CFLAGS_LIBDVDCSS_DVDREAD)
 libfaad2/%.o libfaad2/%.d: CFLAGS += -Ilibfaad2 -D_GNU_SOURCE -DHAVE_CONFIG_H $(CFLAGS_FAAD_FIXED)
 
 loader/% loader/%: CFLAGS += -Iloader -fno-omit-frame-pointer $(CFLAGS_NO_OMIT_LEAF_FRAME_POINTER)