* Borrowed LiViD's MMX and MMX EXT IDCT.

[vlc] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 60001e3a68ae26737f0d043388e489109b9f40bf..dc20060c6cb1986ba63d2db7691ec1cc4db3723f 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -277,8 +277,8 @@ endif
 # 
 ifneq (,$(findstring 86,$(ARCH)))
 ifneq (,$(findstring mmx,$(ARCH)))
-ASM_OBJ =              src/video_output/video_yuv_mmx.o
-STD_PLUGIN_ASM =       plugins/idct/idctmmx_asm.o
+ASM_OBJ =              
+STD_PLUGIN_ASM =       
 endif
 endif
 
@@ -291,7 +291,8 @@ PLUGIN_BEOS =       plugins/beos/beos.o \
                plugins/beos/vout_beos.o
 
 PLUGIN_DSP =   plugins/dsp/dsp.o \
-               plugins/dsp/aout_dsp.o \
+               plugins/dsp/aout_dsp.o
+
 
 PLUGIN_DUMMY = plugins/dummy/dummy.o \
                plugins/dummy/aout_dummy.o \
@@ -311,9 +312,8 @@ PLUGIN_GGI =        plugins/ggi/ggi.o \
 
 PLUGIN_SDL =   plugins/sdl/sdl.o \
                plugins/sdl/intf_sdl.o \
-               plugins/sdl/vout_sdl.o 
-#              plugins/sdl/video_yuv.o \
-#              plugins/sdl/video_yuvall.o
+               plugins/sdl/vout_sdl.o \
+               plugins/sdl/aout_sdl.o 
 
 PLUGIN_NULL =  plugins/null/null.o
 
@@ -338,19 +338,11 @@ PLUGIN_X11=       plugins/x11/x11.o \
 
 PLUGIN_YUV =   plugins/yuv/yuv.o \
                plugins/yuv/video_yuv.o \
-               plugins/yuv/video_yuv8.o \
-               plugins/yuv/video_yuv15.o \
-               plugins/yuv/video_yuv16.o \
-               plugins/yuv/video_yuv24.o \
-               plugins/yuv/video_yuv32.o
-
-PLUGIN_YUVMMX = plugins/yuvmmx/yuvmmx.o \
-               plugins/yuvmmx/video_yuv.o \
-               plugins/yuvmmx/video_yuv8.o \
-               plugins/yuvmmx/video_yuv15.o \
-               plugins/yuvmmx/video_yuv16.o \
-               plugins/yuvmmx/video_yuv24.o \
-               plugins/yuvmmx/video_yuv32.o
+               plugins/yuv/transforms_yuv.o
+
+PLUGIN_YUVMMX =        plugins/yuv/yuvmmx.o \
+               plugins/yuv/video_yuvmmx.o \
+               plugins/yuv/transforms_yuvmmx.o
 
 PLUGIN_IDCT =  plugins/idct/idct.o \
                plugins/idct/idct_common.o
@@ -359,8 +351,10 @@ PLUGIN_IDCTCLASSIC =       plugins/idct/idctclassic.o \
                        plugins/idct/idct_common.o
 
 PLUGIN_IDCTMMX =       plugins/idct/idctmmx.o \
-                       plugins/idct/idct_common.o \
-                       plugins/idct/idctmmx_asm.o
+                       plugins/idct/idct_common.o
+
+PLUGIN_IDCTMMXEXT =    plugins/idct/idctmmxext.o \
+                       plugins/idct/idct_common.o
 
 PLUGIN_ALSA =  plugins/alsa/alsa.o \
                plugins/alsa/aout_alsa.o
@@ -376,7 +370,9 @@ STD_PLUGIN_OBJ =$(PLUGIN_BEOS) \
                $(PLUGIN_YUV) \
                $(PLUGIN_YUVMMX) \
                $(PLUGIN_IDCT) \
+               $(PLUGIN_IDCTCLASSIC) \
                $(PLUGIN_IDCTMMX) \
+               $(PLUGIN_IDCTMMXEXT) \
                $(PLUGIN_SDL) \
                $(PLUGIN_ALSA) \
                $(PLUGIN_NULL)
@@ -408,6 +404,7 @@ all: vlc @ALIASES@ plugins
 
 clean:
        rm -f $(C_OBJ) $(CPP_OBJ) $(ASM_OBJ) $(STD_PLUGIN_OBJ)
+       rm -f plugins/*/*.o src/*/*.o
        rm -f vlc @ALIASES@ lib/*.so
 
 distclean: clean
@@ -533,12 +530,6 @@ lib/dsp.so: $(PLUGIN_DSP)
 lib/alsa.so: $(PLUGIN_ALSA)
        $(CC) $(PCFLAGS) -shared -o $@ $^ -lasound
 
-lib/null.so: $(PLUGIN_NULL)
-       $(CC) $(PCFLAGS) -shared -o $@ $^
-
-lib/dummy.so: $(PLUGIN_DUMMY)
-       $(CC) $(PCFLAGS) -shared -o $@ $^
-
 lib/fb.so: $(PLUGIN_FB)
        $(CC) $(PCFLAGS) -shared -o $@ $^
 
@@ -561,6 +552,12 @@ lib/sdl.so: $(PLUGIN_SDL)
        $(CC) $(PCFLAGS) -shared -o $@ $^ $(LIB_SDL)
 
 ifeq ($(SYS),beos)
+lib/null.so: $(PLUGIN_NULL)
+       $(CC) -nostart -Xlinker -soname=$@ -o $@ $^ plugins/_APP_
+
+lib/dummy.so: $(PLUGIN_DUMMY)
+       $(CC) -nostart -Xlinker -soname=$@ -o $@ $^ plugins/_APP_
+
 lib/idct.so: $(PLUGIN_IDCT)
        $(CC) -nostart -Xlinker -soname=$@ -o $@ $^ plugins/_APP_
 
@@ -575,7 +572,16 @@ lib/idctclassic.so: $(PLUGIN_IDCTCLASSIC)
 
 lib/idctmmx.so: $(PLUGIN_IDCTMMX)
        $(CC) -nostart -Xlinker -soname=$@ -o $@ $^ plugins/_APP_
+
+lib/idctmmxext.so: $(PLUGIN_IDCTMMXEXT)
+       $(CC) -nostart -Xlinker -soname=$@ -o $@ $^ plugins/_APP_
 else
+lib/null.so: $(PLUGIN_NULL)
+       $(CC) $(PCFLAGS) -shared -o $@ $^
+
+lib/dummy.so: $(PLUGIN_DUMMY)
+       $(CC) $(PCFLAGS) -shared -o $@ $^
+
 lib/yuv.so: $(PLUGIN_YUV)
        $(CC) $(PCFLAGS) -shared -o $@ $^
 
@@ -590,6 +596,9 @@ lib/idctclassic.so: $(PLUGIN_IDCTCLASSIC)
 
 lib/idctmmx.so: $(PLUGIN_IDCTMMX)
        $(CC) $(PCFLAGS) -shared -o $@ $^
+
+lib/idctmmxext.so: $(PLUGIN_IDCTMMXEXT)
+       $(CC) $(PCFLAGS) -shared -o $@ $^
 endif
 
 ################################################################################