SYS=@SYS@
PLUGINS=@PLUGINS@
-SNAPSHOTDIR=vlc-@VLC_VERSION@
INSTALL=@INSTALL@
ARCH=@ARCH@
prefix=@prefix@
# Optimizations : don't compile debug versions with them
ifeq ($(OPTIMS),1)
-CFLAGS += -O6
-CFLAGS += -ffast-math -funroll-loops -funroll-all-loops
+CFLAGS += -O3
+CFLAGS += -ffast-math -funroll-loops
CFLAGS += -fomit-frame-pointer
-CFLAGS += @BIZARRE_OPTIMS@
# Optimizations for x86 familiy
ifneq (,$(findstring 86,$(ARCH)))
-CFLAGS += -malign-double
# Optional Pentium Pro optimizations
ifneq (,$(findstring ppro,$(ARCH)))
CFLAGS += -march=pentiumpro -mcpu=pentiumpro
INPUT = src/input/input_ps.o \
src/input/input_ts.o \
+ src/input/dvd_ifo.o \
+ src/input/dvd_css.o \
+ src/input/input_dvd.o \
src/input/mpeg_system.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
AUDIO_OUTPUT = src/audio_output/audio_output.o
#GEN_DECODER = src/generic_decoder/generic_decoder.o
-
VIDEO_PARSER = src/video_parser/video_parser.o \
src/video_parser/vpar_headers.o \
src/video_parser/vpar_blocks.o \
src/video_parser/vpar_synchro.o \
src/video_parser/video_fifo.o
-ifneq (,$(findstring mmx,$(ARCH)))
- vdec_motion_inner = src/video_decoder/vdec_motion_inner_mmx.o
-else
- vdec_motion_inner = src/video_decoder/vdec_motion_inner.o
-endif
-
-VIDEO_DECODER = src/video_decoder/video_decoder.o \
- src/video_decoder/vdec_motion.o \
- src/video_decoder/vdec_idct.o \
- $(vdec_motion_inner)
+VIDEO_DECODER = src/video_decoder/video_decoder.o
MISC = src/misc/mtime.o \
src/misc/tests.o \
#
ifneq (,$(findstring 86,$(ARCH)))
ifneq (,$(findstring mmx,$(ARCH)))
-ASM_OBJ = src/video_decoder/vdec_idctmmx.o \
- src/video_output/video_yuv_mmx.o
+ASM_OBJ =
+STD_PLUGIN_ASM =
endif
endif
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 \
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
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_MOTION = plugins/motion/motion.o \
+ plugins/motion/vdec_motion_common.o \
+ plugins/motion/vdec_motion_inner.o
+
+PLUGIN_MOTIONMMX = plugins/motion/motionmmx.o \
+ plugins/motion/vdec_motion_common.o \
+ plugins/motion/vdec_motion_inner_mmx.o
+
+PLUGIN_MOTIONMMXEXT = plugins/motion/motionmmxext.o \
+ plugins/motion/vdec_motion_common.o \
+ plugins/motion/vdec_motion_inner_mmxext.o
+
+PLUGIN_IDCT = plugins/idct/idct.o \
+ plugins/idct/idct_common.o
+
+PLUGIN_IDCTCLASSIC = plugins/idct/idctclassic.o \
+ plugins/idct/idct_common.o
+
+PLUGIN_IDCTMMX = plugins/idct/idctmmx.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
$(PLUGIN_X11) \
$(PLUGIN_YUV) \
$(PLUGIN_YUVMMX) \
+ $(PLUGIN_MOTION) \
+ $(PLUGIN_MOTIONMMX) \
+ $(PLUGIN_MOTIONMMXEXT) \
+ $(PLUGIN_IDCT) \
+ $(PLUGIN_IDCTCLASSIC) \
+ $(PLUGIN_IDCTMMX) \
+ $(PLUGIN_IDCTMMXEXT) \
$(PLUGIN_SDL) \
$(PLUGIN_ALSA) \
$(PLUGIN_NULL)
+# list duplicates
+STD_PLUGIN_COMMON = plugins/idct/idct_common.o \
+ plugins/motion/vdec_motion_common.o
+
+# filter out duplicates from the plugin object lists
+STD_PLUGIN_OBJ := $(filter-out $(STD_PLUGIN_COMMON) $(STD_PLUGIN_ASM), \
+ $(STD_PLUGIN_OBJ)) $(STD_PLUGIN_COMMON)
+
#
# Other lists of files
#
-objects := $(C_OBJ) $(CPP_OBJ) $(ASM_OBJ) $(STD_PLUGIN_OBJ)
+objects := $(C_OBJ) $(CPP_OBJ) $(ASM_OBJ) $(STD_PLUGIN_OBJ) $(STD_PLUGIN_ASM)
dependancies := $(objects:%.o=.dep/%.d)
# All symbols must be exported
clean:
rm -f $(C_OBJ) $(CPP_OBJ) $(ASM_OBJ) $(STD_PLUGIN_OBJ)
- rm -f vlc @ALIASES@ lib/*.so
+ rm -f plugins/*/*.o src/*/*.o lib/*.so
+ rm -f vlc @ALIASES@
distclean: clean
rm -f src/*/*.o plugins/*/*.o **/*~ *.log
@echo CFLAGS: $(CFLAGS)
@echo DCFLAGS: $(DCFLAGS)
@echo LCFLAGS: $(LCFLAGS)
+ @echo STD_PLUGIN_OBJ: $(STD_PLUGIN_OBJ)
# ugliest of all, but I have no time to do it -- sam
snapshot:
- rm -rf /tmp/${SNAPSHOTDIR}
- mkdir /tmp/${SNAPSHOTDIR}
- cp -a * /tmp/${SNAPSHOTDIR}
- (cd /tmp/${SNAPSHOTDIR} ; \
- make distclean ; \
- find . -type d -name CVS | xargs rm -rf ; \
- find . -type f -name '.*.swp' | xargs rm -f ; \
- find . -type f -name '.cvsignore' | xargs rm -f ; \
- cd .. ; \
- tar czvf ${SNAPSHOTDIR}.tar.gz ${SNAPSHOTDIR} ; \
- tar cIvf ${SNAPSHOTDIR}.tar.bz2 ${SNAPSHOTDIR} )
- rm -rf /tmp/${SNAPSHOTDIR}
- mv /tmp/${SNAPSHOTDIR}.tar.gz ..
- mv /tmp/${SNAPSHOTDIR}.tar.bz2 ..
- @echo "Sources are in ../${SNAPSHOTDIR}.tar.[gz,bz2]"
+ rm -rf /tmp/vlc-@VLC_VERSION@ /tmp/vlc-@VLC_VERSION@nocss
+ # copy archive in /tmp
+ find -type d | while read i ; \
+ do mkdir -p /tmp/vlc-@VLC_VERSION@/$$i ; \
+ done
+ find debian -mindepth 1 -type d | grep -v CVS | while read i ; \
+ do rmdir $$i ; \
+ done
+ # CVS entries
+ find . -type f | grep CVS | while read i ; \
+ do cp $$i /tmp/vlc-@VLC_VERSION@/$$i ; \
+ done
+ # .c .h .in .cpp
+ find include src plugins -type f -name '*.[chi]*' | while read i ; \
+ do cp $$i /tmp/vlc-@VLC_VERSION@/$$i ; \
+ done
+ # copy misc files
+ cp vlc.spec AUTHORS COPYING ChangeLog INSTALL README TODO \
+ Makefile.in Makefile.dep configure configure.in install-sh \
+ config.sub config.guess todo.pl \
+ /tmp/vlc-@VLC_VERSION@/
+ for file in control vlc-gnome.menu vlc.copyright vlc.docs changelog \
+ rules vlc.1 vlc.dirs vlc.menu ; do \
+ cp debian/$$file /tmp/vlc-@VLC_VERSION@/debian/ ; done
+ for file in default8x16.psf default8x9.psf gvlc.png vlc.png ; do \
+ cp share/$$file /tmp/vlc-@VLC_VERSION@/share/ ; done
+
+ # build css-enabled archives
+ (cd /tmp ; tar cf vlc-@VLC_VERSION@.tar vlc-@VLC_VERSION@ ; \
+ bzip2 -f -9 < vlc-@VLC_VERSION@.tar \
+ > vlc-@VLC_VERSION@.tar.bz2 ; \
+ gzip -f -9 vlc-@VLC_VERSION@.tar )
+ mv /tmp/vlc-@VLC_VERSION@.tar.gz /tmp/vlc-@VLC_VERSION@.tar.bz2 ..
+
+ # removing CSS stuff
+ find /tmp/vlc-@VLC_VERSION@ -type f -name '*css*' | xargs rm -f
+ for x in Makefile.in src/input/input_dvd.c src/input/input_dvd.h ; do \
+ rm -f /tmp/vlc-@VLC_VERSION@/$$x ; \
+ perl -ne 'if (/^#e(lse|ndif)/) { $$i=0; } \
+ if (/^#if.*DVD/) { $$i=1; print "#if 0\n"; } \
+ elsif (!$$i || /^#/) { print $$_; }' \
+ < $$x | grep -vi css >| /tmp/vlc-@VLC_VERSION@/$$x ; \
+ done
+ rm -f /tmp/vlc-@VLC_VERSION@/debian/changelog
+ sed 's/\(^vlc ([^-]*\)-/\1nocss-/' < debian/changelog \
+ > /tmp/vlc-@VLC_VERSION@/debian/changelog
+
+ # build nocss archives
+ (cd /tmp ; mv vlc-@VLC_VERSION@ vlc-@VLC_VERSION@nocss ; \
+ tar cf vlc-@VLC_VERSION@nocss.tar vlc-@VLC_VERSION@nocss ; \
+ bzip2 -f -9 < vlc-@VLC_VERSION@nocss.tar \
+ > vlc-@VLC_VERSION@nocss.tar.bz2 ; \
+ gzip -f -9 vlc-@VLC_VERSION@nocss.tar )
+ mv /tmp/vlc-@VLC_VERSION@nocss.tar.gz \
+ /tmp/vlc-@VLC_VERSION@nocss.tar.bz2 ..
+
+ # clean up
+ rm -rf /tmp/vlc-@VLC_VERSION@nocss
plugins: $(PLUGINS:%=lib/%.so)
$(STD_PLUGIN_OBJ): %.o: %.c
$(CC) $(CFLAGS) $(PCFLAGS) -c -o $@ $<
+$(STD_PLUGIN_ASM): %.o: Makefile.dep
+$(STD_PLUGIN_ASM): %.o: %.S
+ $(CC) $(CFLAGS) $(PCFLAGS) -c -o $@ $<
+
$(PLUGIN_GNOME): %.o: Makefile.dep
$(PLUGIN_GNOME): %.o: %.c
$(CC) $(CFLAGS) $(PCFLAGS) `gnome-config --cflags gnomeui` -c -o $@ $<
$(CC) $(PCFLAGS) -shared -o $@ $^
lib/alsa.so: $(PLUGIN_ALSA)
- $(CC) $(PCFLAGS) -shared -o $@ $^
-
-lib/null.so: $(PLUGIN_NULL)
- $(CC) $(PCFLAGS) -shared -o $@ $^
-
-lib/dummy.so: $(PLUGIN_DUMMY)
- $(CC) $(PCFLAGS) -shared -o $@ $^
+ $(CC) $(PCFLAGS) -shared -o $@ $^ -lasound
lib/fb.so: $(PLUGIN_FB)
$(CC) $(PCFLAGS) -shared -o $@ $^
lib/sdl.so: $(PLUGIN_SDL)
$(CC) $(PCFLAGS) -shared -o $@ $^ $(LIB_SDL)
-lib/yuv.so: $(PLUGIN_YUV)
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/yuv.so: $(PLUGIN_YUV)
$(CC) -nostart -Xlinker -soname=$@ -o $@ $^ plugins/_APP_
-else
- $(CC) $(PCFLAGS) -shared -o $@ $^
-endif
lib/yuvmmx.so: $(PLUGIN_YUVMMX)
-ifeq ($(SYS),beos)
+ $(CC) -nostart -Xlinker -soname=$@ -o $@ $^ plugins/_APP_
+
+lib/motion.so: $(PLUGIN_MOTION)
+ $(CC) -nostart -Xlinker -soname=$@ -o $@ $^ plugins/_APP_
+
+lib/motionmmx.so: $(PLUGIN_MOTIONMMX)
+ $(CC) -nostart -Xlinker -soname=$@ -o $@ $^ plugins/_APP_
+
+lib/motionmmxext.so: $(PLUGIN_MOTIONMMXEXT)
+ $(CC) -nostart -Xlinker -soname=$@ -o $@ $^ plugins/_APP_
+
+lib/idct.so: $(PLUGIN_IDCT)
+ $(CC) -nostart -Xlinker -soname=$@ -o $@ $^ plugins/_APP_
+
+lib/idctclassic.so: $(PLUGIN_IDCTCLASSIC)
+ $(CC) -nostart -Xlinker -soname=$@ -o $@ $^ plugins/_APP_
+
+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 $@ $^
+
+lib/yuvmmx.so: $(PLUGIN_YUVMMX)
+ $(CC) $(PCFLAGS) -shared -o $@ $^
+
+lib/motion.so: $(PLUGIN_MOTION)
+ $(CC) $(PCFLAGS) -shared -o $@ $^
+
+lib/motionmmx.so: $(PLUGIN_MOTIONMMX)
+ $(CC) $(PCFLAGS) -shared -o $@ $^
+
+lib/motionmmxext.so: $(PLUGIN_MOTIONMMXEXT)
+ $(CC) $(PCFLAGS) -shared -o $@ $^
+
+lib/idct.so: $(PLUGIN_IDCT)
+ $(CC) $(PCFLAGS) -shared -o $@ $^
+
+lib/idctclassic.so: $(PLUGIN_IDCTCLASSIC)
+ $(CC) $(PCFLAGS) -shared -o $@ $^
+
+lib/idctmmx.so: $(PLUGIN_IDCTMMX)
+ $(CC) $(PCFLAGS) -shared -o $@ $^
+
+lib/idctmmxext.so: $(PLUGIN_IDCTMMXEXT)
$(CC) $(PCFLAGS) -shared -o $@ $^
endif
projects / vlc / blobdiff