From 4af9bf7e02295e001a0a1b16ac77d63d543f1bb6 Mon Sep 17 00:00:00 2001 From: reimar Date: Thu, 8 Jan 2009 19:28:28 +0000 Subject: Switch internal dvdread to libdvdread SVN external. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28280 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 0ff4058fd2..88f8bf034a 100644 --- a/Makefile +++ b/Makefile @@ -236,15 +236,15 @@ SRCS_COMMON-$(DVBIN) += stream/dvb_tune.c \ 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 @@ DIRS = . \ libavformat \ libavutil \ libdvdcss \ - libdvdread \ + libdvdread4 \ libfaad2 \ libmenu \ libmpcodecs \ @@ -839,7 +839,7 @@ mencoder.d mplayer.d vobsub.d gui/win32/gui.d libmpdemux/muxer_avi.d osdep/mplay $(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) -- cgit v1.2.3