* DirectX plugin by Gildas Bazin <gbazin@netcourrier.com>.

[vlc] / Makefile

diff --git a/Makefile b/Makefile
index 831eff52f4bf7b90a6c864432b8fc099f8d65d27..7d67f142a5e43988a584f43d74e515cd325910ee 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@
 # 
 # All possible plugin directories, needed for make clean
 #
-PLUGINS_DIR := alsa beos darwin dsp dummy \
+PLUGINS_DIR := alsa beos darwin directx dsp dummy \
                dvd esd fb ggi glide gtk \
                downmix idct imdct \
                macosx mga \
@@ -22,8 +22,9 @@ PLUGINS_DIR :=        alsa beos darwin dsp dummy \
 #
 # All possible plugin objects
 #
-PLUGINS_TARGETS := alsa/alsa beos/beos darwin/darwin dsp/dsp dummy/dummy \
-               dvd/dvd esd/esd fb/fb ggi/ggi glide/glide gtk/gnome gtk/gtk \
+PLUGINS_TARGETS := alsa/alsa beos/beos darwin/darwin directx/directx \
+               dsp/dsp dummy/dummy dvd/dvd esd/esd fb/fb ggi/ggi \
+               glide/glide gtk/gnome gtk/gtk \
                downmix/downmix downmix/downmixsse downmix/downmix3dn \
                idct/idct idct/idctclassic idct/idctmmx idct/idctmmxext \
                imdct/imdct imdct/imdct3dn imdct/imdctsse \
@@ -39,8 +40,7 @@ INTERFACE =   src/interface/main.o \
                src/interface/interface.o \
                src/interface/intf_msg.o \
                src/interface/intf_playlist.o \
-               src/interface/intf_channels.o \
-               src/interface/intf_urldecode.o \
+               src/interface/intf_channels.o
 
 INPUT =                src/input/input.o \
                src/input/input_ext-dec.o \
@@ -73,10 +73,11 @@ AC3_DECODER =       src/ac3_decoder/ac3_decoder_thread.o \
                src/ac3_decoder/ac3_rematrix.o \
                src/ac3_decoder/ac3_imdct.o
 
-AC3_SPDIF = src/ac3_spdif/ac3_spdif.o \
-               src/ac3_spdif/ac3_iec958.o
+AC3_SPDIF =    src/ac3_spdif/ac3_spdif.o \
+               src/ac3_spdif/ac3_iec958.o
 
-LPCM_DECODER = src/lpcm_decoder/lpcm_decoder_thread.o
+LPCM_DECODER = src/lpcm_decoder/lpcm_decoder_thread.o \
+               src/lpcm_decoder/lpcm_decoder.o
 
 AUDIO_DECODER =        src/audio_decoder/audio_decoder.o \
                src/audio_decoder/adec_generic.o \
@@ -106,7 +107,7 @@ C_OBJ =             $(INTERFACE) \
                $(VIDEO_OUTPUT) \
                $(AUDIO_OUTPUT) \
                $(AC3_DECODER) \
-        $(AC3_SPDIF) \
+               $(AC3_SPDIF) \
                $(LPCM_DECODER) \
                $(AUDIO_DECODER) \
                $(SPU_DECODER) \
@@ -133,7 +134,7 @@ endif
 #
 # Generated header
 #
-H_OBJ =                include/modules_builtin.h
+H_OBJ =                src/misc/modules_builtin.h
 
 #
 # Other lists of files
@@ -176,6 +177,7 @@ distclean: clean
        rm -f **/*.o **/*~ *.log
        rm -f Makefile.opts
        rm -f include/defs.h include/config.h include/modules_builtin.h
+       rm -f src/misc/modules_builtin.h
        rm -f config*status config*cache config*log
        rm -f gmon.out core build-stamp
        rm -Rf .dep
@@ -327,7 +329,7 @@ $(CPP_OBJ): %.o: %.cpp
 # Main application target
 #
 vlc: Makefile.opts Makefile.dep Makefile $(H_OBJ) $(C_OBJ) $(CPP_OBJ) $(BUILTIN_OBJ)
-       $(CC) $(CFLAGS) -o $@ $(C_OBJ) $(CPP_OBJ) $(BUILTIN_OBJ) $(LCFLAGS)
+       $(CC) $(CFLAGS) -o $@ $(C_OBJ) $(CPP_OBJ) $(BUILTIN_OBJ) $(LCFLAGS) $(LIB)
 ifeq ($(SYS),beos)
        rm -f ./lib/_APP_
        ln -s ../vlc ./lib/_APP_