CFLAGS += -malign-double
# Optional Pentium Pro optimizations
ifneq (,$(findstring ppro,$(ARCH)))
-ifneq ($(SYS), BSD)
-CFLAGS += -march=pentiumpro
-endif
+CFLAGS += -march=pentiumpro -mcpu=pentiumpro
else
-CFLAGS += -march=pentium
+CFLAGS += -march=pentium -mcpu=pentium
endif
endif
#
# C compiler flags: plugin compilation
#
-ifneq (,$(findstring solaris,$(SYS)))
PCFLAGS += -fPIC
-endif
#
# C compiler flags: dependancies
INPUT = src/input/input_ps.o \
src/input/input_ts.o \
+ src/input/dvd_ifo.o \
+ src/input/input_dvd.o \
src/input/mpeg_system.o \
src/input/input_ext-dec.o \
src/input/input_dec.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
rm -f config.status config.cache config.log
rm -f gmon.out core build-stamp
rm -rf .dep
- rm -rf debian/tmp debian/files debian/*.debhelper debian/*.substvars
- find debian/* -type d -maxdepth 0 -name 'vlc-*' | xargs rm -rf
install:
mkdir -p $(prefix)/bin
$(INSTALL) vlc $(prefix)/bin
# ugly
- for alias in "" @ALIASES@ ; do if test $$alias ; then ln -s vlc $(prefix)/bin/$$alias ; fi ; done
+ for alias in "" @ALIASES@ ; do if test $$alias ; then rm -f $(prefix)/bin/$$alias && ln -s vlc $(prefix)/bin/$$alias ; fi ; done
mkdir -p $(prefix)/lib/videolan/vlc
- $(INSTALL) -m 644 $(PLUGINS) $(prefix)/lib/videolan/vlc
+ $(INSTALL) -m 644 $(PLUGINS:%=lib/%.so) $(prefix)/lib/videolan/vlc
mkdir -p $(prefix)/share/videolan
$(INSTALL) -m 644 share/*.psf $(prefix)/share/videolan
$(INSTALL) -m 644 share/*.png $(prefix)/share/videolan
@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:
mv /tmp/${SNAPSHOTDIR}.tar.bz2 ..
@echo "Sources are in ../${SNAPSHOTDIR}.tar.[gz,bz2]"
-plugins: lib $(PLUGINS:%=lib/%.so)
-
-lib:
- mkdir -p lib
+plugins: $(PLUGINS:%=lib/%.so)
FORCE:
$(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) `gnome-config --cflags gnomeui` -c -o $@ $<
+ $(CC) $(CFLAGS) $(PCFLAGS) `gnome-config --cflags gnomeui` -c -o $@ $<
$(PLUGIN_GLIDE): %.o: Makefile.dep
$(PLUGIN_GLIDE): %.o: %.c
- $(CC) $(CFLAGS) -I/usr/include/glide -c -o $@ $<
+ $(CC) $(CFLAGS) $(PCFLAGS) -I/usr/include/glide -c -o $@ $<
#
-# Real targets
+# Main application target
#
+
vlc: $(C_OBJ) $(CPP_OBJ) $(ASM_OBJ)
ifeq ($(SYS),beos)
$(CC) $(CFLAGS) $(LCFLAGS) -Xlinker -soname=_APP_ -o $@ $(C_OBJ) $(CPP_OBJ) $(ASM_OBJ)
$(CC) $(CFLAGS) $(LCFLAGS) --export-dynamic @DYNAMIC_FLAG@ -o $@ $(C_OBJ) $(CPP_OBJ) $(ASM_OBJ)
endif
+#
+# Plugin targets
+#
+
lib/beos.so: $(PLUGIN_BEOS)
- $(CC) $(CFLAGS) $(LCFLAGS) -nostart -Xlinker -soname=$@ -o $@ $^ plugins/_APP_
+ $(CC) $(PCFLAGS) -nostart -Xlinker -soname=$@ -o $@ $^ plugins/_APP_
lib/esd.so: $(PLUGIN_ESD)
ifneq (,$(findstring bsd,$(SYS)))
- $(CC) $(LCFLAGS) -shared -lesd -o $@ $^
+ $(CC) $(PCFLAGS) -shared -o $@ $^ -lesd
else
- $(CC) $(LCFLAGS) -shared -laudiofile -lesd -o $@ $^
+ $(CC) $(PCFLAGS) -shared -o $@ $^ -laudiofile -lesd
endif
lib/dsp.so: $(PLUGIN_DSP)
- $(CC) $(LCFLAGS) -shared -o $@ $^
+ $(CC) $(PCFLAGS) -shared -o $@ $^
lib/alsa.so: $(PLUGIN_ALSA)
- $(CC) $(LCFLAGS) -shared -o $@ $^
-
-lib/null.so: $(PLUGIN_NULL)
- $(CC) $(LCFLAGS) -shared -o $@ $^
-
-lib/dummy.so: $(PLUGIN_DUMMY)
- $(CC) $(LCFLAGS) -shared -o $@ $^
+ $(CC) $(PCFLAGS) -shared -o $@ $^ -lasound
lib/fb.so: $(PLUGIN_FB)
- $(CC) $(LCFLAGS) -shared -o $@ $^
+ $(CC) $(PCFLAGS) -shared -o $@ $^
lib/x11.so: $(PLUGIN_X11)
- $(CC) $(LCFLAGS) -shared -L/usr/X11R6/lib -lX11 -lXext -o $@ $^
+ $(CC) $(PCFLAGS) -shared -o $@ $^ -L/usr/X11R6/lib -lX11 -lXext
lib/mga.so: $(PLUGIN_MGA)
- $(CC) $(LCFLAGS) -shared -L/usr/X11R6/lib -lX11 -lXext -o $@ $^
+ $(CC) $(PCFLAGS) -shared -o $@ $^ -L/usr/X11R6/lib -lX11 -lXext
lib/gnome.so: $(PLUGIN_GNOME)
- $(CC) $(LCFLAGS) -shared `gnome-config --libs gnomeui | sed 's,-rdynamic,,'` -o $@ $^
+ $(CC) $(PCFLAGS) -shared -o $@ $^ `gnome-config --libs gnomeui | sed 's,-rdynamic,,'`
lib/glide.so: $(PLUGIN_GLIDE)
- $(CC) $(LCFLAGS) -shared $(LIB_GLIDE) -o $@ $^
+ $(CC) $(PCFLAGS) -shared -o $@ $^ $(LIB_GLIDE)
lib/ggi.so: $(PLUGIN_GGI)
- $(CC) $(LCFLAGS) -shared $(LIB_GGI) -o $@ $^
+ $(CC) $(PCFLAGS) -shared -o $@ $^ $(LIB_GGI)
lib/sdl.so: $(PLUGIN_SDL)
- $(CC) $(LCFLAGS) -shared $(LIB_SDL) -o $@ $^
+ $(CC) $(PCFLAGS) -shared -o $@ $^ $(LIB_SDL)
-lib/yuv.so: $(PLUGIN_YUV)
ifeq ($(SYS),beos)
- $(CC) $(CFLAGS) -nostart -Xlinker -soname=$@ -o $@ $^ plugins/_APP_
-else
- $(CC) $(LCFLAGS) -shared -o $@ $^
-endif
+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_
lib/yuvmmx.so: $(PLUGIN_YUVMMX)
-ifeq ($(SYS),beos)
- $(CC) $(CFLAGS) -nostart -Xlinker -soname=$@ -o $@ $^ plugins/_APP_
+ $(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
- $(CC) $(LCFLAGS) -shared -o $@ $^
+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