X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile;h=fb97d2529608be82c11d795b56531f51731ebf42;hb=e56a842d2e5ae5e4cdc412adb73e7c952e0f29cb;hp=c030cbdc733b113a7cdb4ae560bd4f6637c6306d;hpb=b1f4d5b12789e6d608288b71ebefa59acf4fba86;p=x264

diff --git a/Makefile b/Makefile
index c030cbdc..fb97d252 100644
--- a/Makefile
+++ b/Makefile
@@ -2,12 +2,17 @@
 
 include config.mak
 
+all: default
+
 SRCS = common/mc.c common/predict.c common/pixel.c common/macroblock.c \
        common/frame.c common/dct.c common/cpu.c common/cabac.c \
-       common/common.c common/mdate.c common/csp.c \
+       common/common.c common/mdate.c common/set.c \
+       common/quant.c common/vlc.c \
        encoder/analyse.c encoder/me.c encoder/ratecontrol.c \
        encoder/set.c encoder/macroblock.c encoder/cabac.c \
-       encoder/cavlc.c encoder/encoder.c encoder/eval.c
+       encoder/cavlc.c encoder/encoder.c
+
+SRCCLI = x264.c matroska.c muxers.c
 
 # Visualization sources
 ifeq ($(VIS),yes)
@@ -15,76 +20,169 @@ SRCS   += common/visualize.c common/display-x11.c
 endif
 
 # MMX/SSE optims
+ifneq ($(AS),)
+X86SRC0 = cabac-a.asm dct-a.asm deblock-a.asm mc-a.asm mc-a2.asm \
+          pixel-a.asm predict-a.asm quant-a.asm sad-a.asm \
+          cpu-a.asm dct-32.asm
+X86SRC = $(X86SRC0:%=common/x86/%)
+
 ifeq ($(ARCH),X86)
-SRCS   += common/i386/mc-c.c common/i386/dct-c.c common/i386/predict.c
-ASMSRC  = common/i386/dct-a.asm common/i386/cpu-a.asm \
-          common/i386/pixel-a.asm common/i386/mc-a.asm \
-          common/i386/mc-a2.asm common/i386/predict-a.asm
-OBJASM  = $(ASMSRC:%.asm=%.o)
+ARCH_X86 = yes
+ASMSRC   = $(X86SRC) common/x86/pixel-32.asm
 endif
 
-# MMX/SSE optims
 ifeq ($(ARCH),X86_64)
-SRCS   += common/i386/mc-c.c common/i386/dct-c.c common/i386/predict.c
-ASMSRC  = common/amd64/dct-a.asm common/amd64/cpu-a.asm \
-          common/amd64/pixel-a.asm common/amd64/mc-a.asm \
-          common/amd64/mc-a2.asm common/amd64/predict-a.asm
+ARCH_X86 = yes
+ASMSRC   = $(X86SRC:-32.asm=-64.asm)
+ASFLAGS += -DARCH_X86_64
+endif
+
+ifdef ARCH_X86
+ASFLAGS += -Icommon/x86/
+SRCS   += common/x86/mc-c.c common/x86/predict-c.c
 OBJASM  = $(ASMSRC:%.asm=%.o)
+$(OBJASM): common/x86/x86inc.asm common/x86/x86util.asm
+checkasm: tools/checkasm-a.o
+endif
 endif
 
 # AltiVec optims
 ifeq ($(ARCH),PPC)
-SRCS += common/ppc/mc.c common/ppc/pixel.c common/ppc/dct.c
+ALTIVECSRC += common/ppc/mc.c common/ppc/pixel.c common/ppc/dct.c \
+              common/ppc/quant.c common/ppc/deblock.c \
+              common/ppc/predict.c
+SRCS += $(ALTIVECSRC)
+$(ALTIVECSRC:%.c=%.o): CFLAGS += $(ALTIVECFLAGS)
+endif
+
+# VIS optims
+ifeq ($(ARCH),UltraSparc)
+ASMSRC += common/sparc/pixel.asm
+OBJASM  = $(ASMSRC:%.asm=%.o)
+endif
+
+ifneq ($(HAVE_GETOPT_LONG),1)
+SRCS += extras/getopt.c
 endif
 
 OBJS = $(SRCS:%.c=%.o)
+OBJCLI = $(SRCCLI:%.c=%.o)
 DEP  = depend
 
+.PHONY: all default fprofiled clean distclean install uninstall dox test testclean
+
 default: $(DEP) x264$(EXE)
 
 libx264.a: .depend $(OBJS) $(OBJASM)
 	ar rc libx264.a $(OBJS) $(OBJASM)
 	ranlib libx264.a
 
-x264$(EXE): libx264.a x264.o
-	$(CC) -o $@ x264.o libx264.a $(LDFLAGS)
+$(SONAME): .depend $(OBJS) $(OBJASM)
+	$(CC) -shared -o $@ $(OBJS) $(OBJASM) $(SOFLAGS) $(LDFLAGS)
 
-x264vfw.dll: libx264.a $(wildcard vfw/*.c vfw/*.h)
-	make -C vfw/build/cygwin
+x264$(EXE): $(OBJCLI) libx264.a 
+	$(CC) -o $@ $+ $(LDFLAGS)
 
-checkasm: testing/checkasm.o libx264.a
-	$(CC) -o $@ $< libx264.a $(LDFLAGS)
+checkasm: tools/checkasm.o libx264.a
+	$(CC) -o $@ $+ $(LDFLAGS)
 
 %.o: %.asm
 	$(AS) $(ASFLAGS) -o $@ $<
+# delete local/anonymous symbols, so they don't show up in oprofile
+	-@ strip -x $@
 
-.depend: config.mak config.h
+.depend: config.mak
 	rm -f .depend
 # Hacky - because gcc 2.9x doesn't have -MT
-	$(foreach SRC, $(SRCS) x264.c, ( echo -n "`dirname $(SRC)`/" && $(CC) $(CFLAGS) $(SRC) -MM -g0 ) 1>> .depend;)
+	$(foreach SRC, $(SRCS) $(SRCCLI), ( $(ECHON) "`dirname $(SRC)`/" && $(CC) $(CFLAGS) $(ALTIVECFLAGS) $(SRC) -MM -g0 ) 1>> .depend;)
 
-config.h: $(wildcard .svn/entries */.svn/entries */*/.svn/entries)
-	./version.sh
+config.mak: $(wildcard .svn/entries */.svn/entries */*/.svn/entries)
+	./configure $(CONFIGURE_ARGS)
 
 depend: .depend
 ifneq ($(wildcard .depend),)
 include .depend
 endif
 
+SRC2 = $(SRCS) $(SRCCLI)
+# These should cover most of the important codepaths
+OPT0 = --crf 30 -b1 -m1 -r1 --me dia --no-cabac --pre-scenecut --direct temporal --no-ssim --no-psnr
+OPT1 = --crf 16 -b2 -m3 -r3 --me hex -8 --direct spatial --no-dct-decimate
+OPT2 = --crf 26 -b2 -m5 -r2 --me hex -8 -w --cqm jvt --nr 100
+OPT3 = --crf 18 -b3 -m9 -r5 --me umh -8 -t1 -A all --mixed-refs -w --b-pyramid --direct auto --no-fast-pskip
+OPT4 = --crf 22 -b3 -m7 -r4 --me esa -8 -t2 -A all --mixed-refs
+OPT5 = --frames 50 --crf 24 -b3 -m9 -r3 --me tesa -8 -t1 --mixed-refs
+OPT6 = --frames 50 -q0 -m9 -r2 --me hex -Aall
+OPT7 = --frames 50 -q0 -m2 -r1 --me hex --no-cabac
+
+ifeq (,$(VIDS))
+fprofiled:
+	@echo 'usage: make fprofiled VIDS="infile1 infile2 ..."'
+	@echo 'where infiles are anything that x264 understands,'
+	@echo 'i.e. YUV with resolution in the filename, y4m, or avisynth.'
+else
+fprofiled:
+	$(MAKE) clean
+	mv config.mak config.mak2
+	sed -e 's/CFLAGS.*/& -fprofile-generate/; s/LDFLAGS.*/& -fprofile-generate/' config.mak2 > config.mak
+	$(MAKE) x264$(EXE)
+	$(foreach V, $(VIDS), $(foreach I, 0 1 2 3 4 5 6 7, ./x264$(EXE) $(OPT$I) $(V) --progress -o $(DEVNULL) ;))
+	rm -f $(SRC2:%.c=%.o)
+	sed -e 's/CFLAGS.*/& -fprofile-use/; s/LDFLAGS.*/& -fprofile-use/' config.mak2 > config.mak
+	$(MAKE)
+	rm -f $(SRC2:%.c=%.gcda) $(SRC2:%.c=%.gcno)
+	mv config.mak2 config.mak
+endif
+
 clean:
-	rm -f $(OBJS) $(OBJASM) config.h *.a x264.o x264 x264.exe .depend TAGS
-	rm -rf vfw/build/cygwin/bin
+	rm -f $(OBJS) $(OBJASM) $(OBJCLI) $(SONAME) *.a x264 x264.exe .depend TAGS
+	rm -f checkasm checkasm.exe tools/checkasm.o
+	rm -f $(SRC2:%.c=%.gcda) $(SRC2:%.c=%.gcno)
+	- sed -e 's/ *-fprofile-\(generate\|use\)//g' config.mak > config.mak2 && mv config.mak2 config.mak
 
 distclean: clean
-	rm -f config.mak vfw/build/cygwin/config.mak
+	rm -f config.mak config.h x264.pc
+	rm -rf test/
 
-install: x264
-	install -d $(DESTDIR)$(bindir) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
+install: x264$(EXE) $(SONAME)
+	install -d $(DESTDIR)$(bindir) $(DESTDIR)$(includedir)
+	install -d $(DESTDIR)$(libdir) $(DESTDIR)$(libdir)/pkgconfig
 	install -m 644 x264.h $(DESTDIR)$(includedir)
 	install -m 644 libx264.a $(DESTDIR)$(libdir)
-	install x264 $(DESTDIR)$(bindir)
+	install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig
+	install x264$(EXE) $(DESTDIR)$(bindir)
+	ranlib $(DESTDIR)$(libdir)/libx264.a
+ifeq ($(SYS),MINGW)
+	$(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(bindir))
+else
+	$(if $(SONAME), ln -sf $(SONAME) $(DESTDIR)$(libdir)/libx264.$(SOSUFFIX))
+	$(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(libdir))
+endif
+	$(if $(IMPLIBNAME), install -m 644 $(IMPLIBNAME) $(DESTDIR)$(libdir))
+
+uninstall:
+	rm -f $(DESTDIR)$(includedir)/x264.h $(DESTDIR)$(libdir)/libx264.a
+	rm -f $(DESTDIR)$(bindir)/x264 $(DESTDIR)$(libdir)/pkgconfig/x264.pc
+	$(if $(SONAME), rm -f $(DESTDIR)$(libdir)/$(SONAME) $(DESTDIR)$(libdir)/libx264.$(SOSUFFIX))
 
 etags: TAGS
 
 TAGS:
 	etags $(SRCS)
+
+dox:
+	doxygen Doxyfile
+
+ifeq (,$(VIDS))
+test:
+	@echo 'usage: make test VIDS="infile1 infile2 ..."'
+	@echo 'where infiles are anything that x264 understands,'
+	@echo 'i.e. YUV with resolution in the filename, y4m, or avisynth.'
+else
+test:
+	perl tools/regression-test.pl --version=head,current --options='$(OPT0)' --options='$(OPT1)' --options='$(OPT2)' $(VIDS:%=--input=%)
+endif
+
+testclean:
+	rm -f test/*.log test/*.264
+	$(foreach DIR, $(wildcard test/x264-r*/), cd $(DIR) ; make clean ; cd ../.. ;)