Commit 36e88eb4 authored by Stéphane Borel's avatar Stéphane Borel

*Some fixes for dvdread plugin.

It compiles but doesn't work yet.
parent cc0f0bb6
......@@ -16,33 +16,22 @@ ALL_SOFLAGS := $(SOFLAGS)$(MAJOR_SO)
SOFLAGS :=
endif
#
# C headers directories
#
CFLAGS := -I../../include -I../../extras $(CFLAGS)
#
# Objects
#
OBJ_C = dvdread.o dvd_udf.o nav_print.o nav_read.o ifo_print.o ifo_read.o
ALL_OBJ = $(OBJ_C) $(OBJ_LIBDVDREAD)
PLUGIN_OBJ = $(OBJ_C) $(OBJ_LIBDVDREAD)
BUILTIN_OBJ = $(OBJ_C:%.o=DVDREAD_%.o)
ALL_OBJ = $(PLUGIN_OBJ) $(BUILTIN_OBJ)
$(OBJ_C): %.o: .dep/%.d
$(OBJ_C): %.o: %.c
$(CC) $(CFLAGS) $(CFLAGS_LIBDVDREAD) $(PCFLAGS) -c -o $@ $<
$(BUILTIN_OBJ): DVDREAD_%.o: .dep/%.d
$(BUILTIN_OBJ): DVDREAD_%.o: %.c
$(CC) $(CFLAGS) $(CFLAGS_LIBDVDREAD) $(PCFLAGS) -c -o $@ $<
../../lib/$(FULL_SO): $(OBJ_C) $(OBJ_LIBDVDREAD)
$(CC) $(PCFLAGS) $(ALL_SOFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_LIBDVDREAD)
rm -f ../../lib/$(BASE_SO) && ln -s $(FULL_SO) ../../lib/$(BASE_SO)
rm -f ../../lib/$(MAJOR_SO) && ln -s $(FULL_SO) ../../lib/$(MAJOR_SO)
../../lib/$(BASE_A): libdvdcss $(BUILTIN_OBJ) $(OBJ_LIBDVDREAD)
ar r $@ $(BUILTIN_OBJ)
$(RANLIB) $@
#
# Standard dependencies
#
C_DEP := $(ALL_OBJ:%.o=.dep/%.d)
#
# Virtual targets
......@@ -54,22 +43,23 @@ clean:
rm -f *.o
rm -rf .dep
libdvdcss:
@cd ../../ && $(MAKE) libdvdcss
FORCE:
#install:
# mkdir -p $(DESTDIR)$(includedir)/videolan
# $(INSTALL) -m 644 videolan/dvdcss.h $(DESTDIR)$(includedir)/videolan
# mkdir -p $(DESTDIR)$(libdir)
# -$(INSTALL) -m 644 ../../lib/$(BASE_A) $(DESTDIR)$(libdir)
# -$(INSTALL) -m 644 ../../lib/$(FULL_SO) $(DESTDIR)$(libdir)
# rm -f $(DESTDIR)$(libdir)/$(BASE_SO) && ln -s $(FULL_SO) $(DESTDIR)$(libdir)/$(BASE_SO)
# rm -f $(DESTDIR)$(libdir)/$(MAJOR_SO) && ln -s $(FULL_SO) $(DESTDIR)$(libdir)/$(MAJOR_SO)
#
#uninstall:
# rm -f $(DESTDIR)$(includedir)/videolan/dvdcss.h
# rm -f $(DESTDIR)$(libdir)/$(BASE_A)
# rm -f $(DESTDIR)$(libdir)/$(BASE_SO)
# rm -f $(DESTDIR)$(libdir)/$(MAJOR_SO)
# rm -f $(DESTDIR)$(libdir)/$(FULL_SO)
$(ALL_OBJ): %.o: ../../Makefile.dep Makefile
$(C_DEP): %.d: FORCE
@$(MAKE) -s --no-print-directory -f ../../Makefile.dep $@
$(OBJ_C): %.o: .dep/%.d
$(OBJ_C): %.o: %.c
$(CC) $(CFLAGS) $(CFLAGS_LIBDVDREAD) $(PCFLAGS) -c -o $@ $<
../../lib/$(FULL_SO): $(OBJ_C) $(OBJ_LIBDVDREAD)
$(CC) $(PCFLAGS) $(ALL_SOFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_LIBDVDREAD)
rm -f ../../lib/$(BASE_SO) && ln -s $(FULL_SO) ../../lib/$(BASE_SO)
rm -f ../../lib/$(MAJOR_SO) && ln -s $(FULL_SO) ../../lib/$(MAJOR_SO)
../../lib/$(BASE_A): $(OBJ_C) $(OBJ_LIBDVDREAD)
ar r $@ $^
$(RANLIB) $@
......@@ -2,7 +2,7 @@
* dvdread.c : DvdRead input module for vlc
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: dvdread.c,v 1.4 2001/12/30 07:09:55 sam Exp $
* $Id: dvdread.c,v 1.5 2001/12/30 22:10:26 stef Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -52,18 +52,18 @@ static void UnprobeLibDVDCSS( void );
* Build configuration tree.
*****************************************************************************/
MODULE_CONFIG_START
ADD_WINDOW( "Configuration for DVD module" )
ADD_COMMENT( "foobar !" )
MODULE_CONFIG_STOP
MODULE_INIT_START
p_module->i_capabilities = MODULE_CAPABILITY_NULL
| MODULE_CAPABILITY_INPUT;
#ifdef GOD_DAMN_DMCA
p_module->psz_longname = "DVD input module, uses libdvdcss if present";
SET_DESCRIPTION( "DVDRead input module, uses libdvdcss if present" )
ADD_CAPABILITY( INPUT, 70 )
#else
p_module->psz_longname = "DVD input module, linked with libdvdcss";
SET_DESCRIPTION( "DVDRead input module, linked with libdvdcss" )
ADD_CAPABILITY( INPUT, 80 )
#endif
ADD_SHORTCUT( "dvdread" )
MODULE_INIT_STOP
MODULE_ACTIVATE_START
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment