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

[vlc] / Makefile

diff --git a/Makefile b/Makefile
index 10f9e2996241c81f1a3804073a0dee8be88f7c94..7d67f142a5e43988a584f43d74e515cd325910ee 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -11,9 +11,9 @@
 # 
 # All possible plugin directories, needed for make clean
 #
-PLUGINS_DIR := alsa beos darwin dsp dummy \
-               dvd esd fb ggi glide gnome gtk \
-               idct \
+PLUGINS_DIR := alsa beos darwin directx dsp dummy \
+               dvd esd fb ggi glide gtk \
+               downmix idct imdct \
                macosx mga \
                motion \
                mpeg null qt sdl \
@@ -22,9 +22,12 @@ 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 gnome/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 \
                macosx/macosx mga/mga \
                motion/motion motion/motionmmx motion/motionmmxext \
                mpeg/es mpeg/ps mpeg/ts null/null qt/qt sdl/sdl \
@@ -37,25 +40,24 @@ 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_ext-dec.o \
+INPUT =                src/input/input.o \
+               src/input/input_ext-dec.o \
                src/input/input_ext-intf.o \
                src/input/input_dec.o \
                src/input/input_programs.o \
                src/input/input_netlist.o \
                src/input/input_clock.o \
-               src/input/input.o \
                src/input/mpeg_system.o
 
 AUDIO_OUTPUT =         src/audio_output/audio_output.o \
-               src/audio_output/aout_fifo.o \
+               src/audio_output/aout_ext-dec.o \
                src/audio_output/aout_u8.o \
                src/audio_output/aout_s8.o \
                src/audio_output/aout_u16.o \
                src/audio_output/aout_s16.o \
-        src/audio_output/aout_spdif.o
+               src/audio_output/aout_spdif.o
 
 VIDEO_OUTPUT =         src/video_output/video_output.o \
                src/video_output/video_text.o \
@@ -69,12 +71,10 @@ AC3_DECODER =       src/ac3_decoder/ac3_decoder_thread.o \
                src/ac3_decoder/ac3_bit_allocate.o \
                src/ac3_decoder/ac3_mantissa.o \
                src/ac3_decoder/ac3_rematrix.o \
-               src/ac3_decoder/ac3_imdct.o \
-               src/ac3_decoder/ac3_downmix.o \
-               src/ac3_decoder/ac3_downmix_c.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 \
                src/lpcm_decoder/lpcm_decoder.o
@@ -107,7 +107,7 @@ C_OBJ =             $(INTERFACE) \
                $(VIDEO_OUTPUT) \
                $(AUDIO_OUTPUT) \
                $(AC3_DECODER) \
-        $(AC3_SPDIF) \
+               $(AC3_SPDIF) \
                $(LPCM_DECODER) \
                $(AUDIO_DECODER) \
                $(SPU_DECODER) \
@@ -134,7 +134,7 @@ endif
 #
 # Generated header
 #
-H_OBJ =                include/modules_builtin.h
+H_OBJ =                src/misc/modules_builtin.h
 
 #
 # Other lists of files
@@ -177,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
@@ -317,12 +318,7 @@ endif
 $(C_OBJ): %.o: Makefile.opts Makefile.dep Makefile
 $(C_OBJ): %.o: .dep/%.d
 $(C_OBJ): %.o: %.c
-ifneq (,$(findstring darwin,$(SYS)))
-#this is uglier of all
-       @if test "src/ac3_decoder/ac3_imdct.c" = "$<"; then $(CC) `echo $(CFLAGS) | sed -e 's/-O3/-O/'` -c -o $@ $<; echo "(CC) `echo $(CFLAGS) | sed -e 's/-O3/-O/'` -c -o $@ $<"; else $(CC) $(CFLAGS) -c -o $@ $<; echo "$(CC) $(CFLAGS) -c -o $@ $<"; fi
-else
        $(CC) $(CFLAGS) -c -o $@ $<
-endif
 
 $(CPP_OBJ): %.o: Makefile.opts Makefile.dep Makefile
 $(CPP_OBJ): %.o: .dep/%.dpp
@@ -333,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_
@@ -354,5 +350,4 @@ $(PLUGIN_OBJ): FORCE
 builtins: Makefile.modules Makefile.opts Makefile.dep Makefile $(BUILTIN_OBJ)
 $(BUILTIN_OBJ): FORCE
        cd $(shell echo " "$(PLUGINS_TARGETS)" " | sed -e 's@.* \([^/]*/\)'$(@:lib/%.a=%)' .*@plugins/\1@' -e 's@^ .*@@') && $(MAKE) $(@:%=../../%)
-       $(RANLIB) $@