From 1ee1a271f8fd49398a182f483cf5e6811704dbc7 Mon Sep 17 00:00:00 2001 From: reimar Date: Sat, 10 Jan 2009 13:51:02 +0000 Subject: Support an "internal" dvdnav version to make it easier to compile with, test and debug dvdnav SVN. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28291 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 88f8bf034a..ce91463ca0 100644 --- a/Makefile +++ b/Makefile @@ -234,6 +234,17 @@ SRCS_COMMON-$(CDDB) += stream/stream_cddb.c SRCS_COMMON-$(DVBIN) += stream/dvb_tune.c \ stream/stream_dvb.c SRCS_COMMON-$(DVDNAV) += stream/stream_dvdnav.c +SRCS_COMMON-$(DVDNAV_INTERNAL) += libdvdnav/dvdnav.c \ + libdvdnav/highlight.c \ + libdvdnav/navigation.c \ + libdvdnav/read_cache.c \ + libdvdnav/remap.c \ + libdvdnav/searching.c \ + libdvdnav/settings.c \ + libdvdnav/vm/decoder.c \ + libdvdnav/vm/vm.c \ + libdvdnav/vm/vmcmd.c \ + SRCS_COMMON-$(DVDREAD) += stream/stream_dvd.c \ stream/stream_dvd_common.c SRCS_COMMON-$(DVDREAD_INTERNAL) += libdvdread4/bitreader.c \ @@ -733,6 +744,8 @@ DIRS = . \ libavformat \ libavutil \ libdvdcss \ + libdvdnav \ + libdvdnav/vm \ libdvdread4 \ libfaad2 \ libmenu \ @@ -839,6 +852,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) +libdvdnav/%.o libdvdnav/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H -DVERSION=\"MPlayer-custom\" 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) -- cgit v1.2.3