mirror of
https://github.com/mpv-player/mpv
synced 2024-12-25 16:33:02 +00:00
Rename libdvdread to dvdread. We really only include only the dvdread
subdirectory of libdvdread. This will also allow getting rid of some local modifications. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20997 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
2f67bb7b34
commit
8cf4397274
@ -58,7 +58,7 @@ License: GNU General Public License
|
||||
Name: libdvdread
|
||||
Version: 0.9.4 + patches
|
||||
Homepage: http://www.dtek.chalmers.se/groups/dvd/development.shtml
|
||||
Directory: libdvdread
|
||||
Directory: dvdread
|
||||
Copyright: 1998, 1999 Eric Smith <eric@brouhaha.com>
|
||||
1999 Christian Wolff for convergence integrated media
|
||||
2000-2001 Billy Biggs <vektor@dumbterm.net>,
|
||||
|
12
Makefile
12
Makefile
@ -112,7 +112,7 @@ ifeq ($(VIDIX),yes)
|
||||
PARTS += libdha vidix
|
||||
endif
|
||||
ifeq ($(DVDREAD_INTERNAL),yes)
|
||||
PARTS += libdvdread
|
||||
PARTS += dvdread
|
||||
PARTS += libdvdcss
|
||||
endif
|
||||
ifeq ($(GUI),yes)
|
||||
@ -168,8 +168,8 @@ ifeq ($(VIDIX),yes)
|
||||
COMMON_DEPS += libdha/libdha.so vidix/libvidix.a
|
||||
endif
|
||||
ifeq ($(DVDREAD_INTERNAL),yes)
|
||||
COMMON_DEPS += libdvdread/libdvdread.a
|
||||
COMMON_LIBS += libdvdread/libdvdread.a
|
||||
COMMON_DEPS += dvdread/libdvdread.a
|
||||
COMMON_LIBS += dvdread/libdvdread.a
|
||||
COMMON_DEPS += libdvdcss/libdvdcss.a
|
||||
COMMON_LIBS += libdvdcss/libdvdcss.a
|
||||
endif
|
||||
@ -201,8 +201,8 @@ all: $(ALL_PRG)
|
||||
libaf/libaf.a:
|
||||
$(MAKE) -C libaf
|
||||
|
||||
libdvdread/libdvdread.a:
|
||||
$(MAKE) -C libdvdread
|
||||
dvdread/libdvdread.a:
|
||||
$(MAKE) -C dvdread
|
||||
|
||||
libdvdcss/libdvdcss.a:
|
||||
$(MAKE) -C libdvdcss
|
||||
@ -476,7 +476,7 @@ input/libinput.a: .norecurse $(wildcard input/*.[ch])
|
||||
|
||||
libmenu/libmenu.a: .norecurse $(wildcard libmenu/*.[ch])
|
||||
libaf/libaf.a: .norecurse $(wildcard libaf/*.[ch])
|
||||
libdvdread/libdvdread.a: .norecurse $(wildcard libdvdread/*.[ch])
|
||||
dvdread/libdvdread.a: .norecurse $(wildcard dvdread/*.[ch])
|
||||
libdvdcss/libdvdcss.a: .norecurse $(wildcard libdvdcss/*.[ch])
|
||||
|
||||
libmpdemux/libmpdemux.a: .norecurse $(wildcard libmpdemux/*.[ch] libmpdemux/*/*.[ch])
|
||||
|
@ -20,7 +20,7 @@ all: netstream
|
||||
# it does not work with either GUI, LIVE555 or libavformat enabled
|
||||
DEPS = $(MPROOT)/libmpdemux/libmpdemux.a \
|
||||
$(MPROOT)/stream/stream.a \
|
||||
$(MPROOT)/libdvdread/libdvdread.a \
|
||||
$(MPROOT)/dvdread/libdvdread.a \
|
||||
$(MPROOT)/libmpcodecs/native/minilzo.o \
|
||||
$(MPROOT)/libvo/aclib.o \
|
||||
$(MPROOT)/libmpcodecs/img_format.o \
|
||||
|
@ -2,10 +2,10 @@
|
||||
#ifdef USE_DVDREAD
|
||||
|
||||
#ifdef USE_DVDREAD_INTERNAL
|
||||
#include "libdvdread/dvd_reader.h"
|
||||
#include "libdvdread/ifo_types.h"
|
||||
#include "libdvdread/ifo_read.h"
|
||||
#include "libdvdread/nav_read.h"
|
||||
#include "dvdread/dvd_reader.h"
|
||||
#include "dvdread/ifo_types.h"
|
||||
#include "dvdread/ifo_read.h"
|
||||
#include "dvdread/nav_read.h"
|
||||
#elif defined(USE_DVDNAV)
|
||||
#include <dvd_reader.h>
|
||||
#include <ifo_types.h>
|
||||
|
Loading…
Reference in New Issue
Block a user