X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile;h=d0b16338e5c25ca99d70071304c8465e4d9fa4e1;hb=1e4a24f305c006a95fec00131703d0e0ecae3a38;hp=4faed55df6f12776c65acf97047ed94ea7decbb6;hpb=31311f254971e1da51d817cb580fc4fe1f4d5f20;p=x264 diff --git a/Makefile b/Makefile index 4faed55d..d0b16338 100644 --- a/Makefile +++ b/Makefile @@ -36,6 +36,8 @@ OBJCLI = OBJCHK = tools/checkasm.o +OBJEXAMPLE = example.o + CONFIG := $(shell cat config.h) # GPL-only files @@ -85,12 +87,12 @@ X86SRC0 += sad-a.asm endif X86SRC = $(X86SRC0:%=common/x86/%) -ifeq ($(ARCH),X86) +ifeq ($(SYS_ARCH),X86) ARCH_X86 = yes ASMSRC = $(X86SRC) common/x86/pixel-32.asm endif -ifeq ($(ARCH),X86_64) +ifeq ($(SYS_ARCH),X86_64) ARCH_X86 = yes ASMSRC = $(X86SRC:-32.asm=-64.asm) common/x86/trellis-64.asm endif @@ -104,7 +106,7 @@ endif endif # AltiVec optims -ifeq ($(ARCH),PPC) +ifeq ($(SYS_ARCH),PPC) ifneq ($(AS),) SRCS += common/ppc/mc.c common/ppc/pixel.c common/ppc/dct.c \ common/ppc/quant.c common/ppc/deblock.c \ @@ -113,13 +115,42 @@ endif endif # NEON optims -ifeq ($(ARCH),ARM) +ifeq ($(SYS_ARCH),ARM) ifneq ($(AS),) ASMSRC += common/arm/cpu-a.S common/arm/pixel-a.S common/arm/mc-a.S \ common/arm/dct-a.S common/arm/quant-a.S common/arm/deblock-a.S \ - common/arm/predict-a.S + common/arm/predict-a.S common/arm/bitstream-a.S SRCS += common/arm/mc-c.c common/arm/predict-c.c OBJASM = $(ASMSRC:%.S=%.o) +OBJCHK += tools/checkasm-arm.o +endif +endif + +# AArch64 NEON optims +ifeq ($(SYS_ARCH),AARCH64) +ifneq ($(AS),) +ASMSRC += common/aarch64/bitstream-a.S \ + common/aarch64/cabac-a.S \ + common/aarch64/dct-a.S \ + common/aarch64/deblock-a.S \ + common/aarch64/mc-a.S \ + common/aarch64/pixel-a.S \ + common/aarch64/predict-a.S \ + common/aarch64/quant-a.S +SRCS += common/aarch64/asm-offsets.c \ + common/aarch64/mc-c.c \ + common/aarch64/predict-c.c +OBJASM = $(ASMSRC:%.S=%.o) +OBJCHK += tools/checkasm-aarch64.o +endif +endif + +# MSA optims +ifeq ($(SYS_ARCH),MIPS) +ifneq ($(findstring HAVE_MSA 1, $(CONFIG)),) +SRCS += common/mips/mc-c.c common/mips/dct-c.c \ + common/mips/deblock-c.c common/mips/pixel-c.c \ + common/mips/predict-c.c common/mips/quant-c.c endif endif @@ -137,7 +168,7 @@ endif ifeq ($(HAVE_OPENCL),yes) common/oclobj.h: common/opencl/x264-cl.h $(wildcard $(SRCPATH)/common/opencl/*.cl) - cat $^ | perl $(SRCPATH)/tools/cltostr.pl x264_opencl_source > $@ + cat $^ | $(SRCPATH)/tools/cltostr.sh $@ GENERATED += common/oclobj.h SRCS += common/opencl.c encoder/slicetype-cl.c endif @@ -146,7 +177,7 @@ OBJS += $(SRCS:%.c=%.o) OBJCLI += $(SRCCLI:%.c=%.o) OBJSO += $(SRCSO:%.c=%.o) -.PHONY: all default fprofiled clean distclean install uninstall lib-static lib-shared cli install-lib-dev install-lib-static install-lib-shared install-cli +.PHONY: all default fprofiled clean distclean install install-* uninstall cli lib-* etags cli: x264$(EXE) lib-static: $(LIBX264) @@ -161,9 +192,10 @@ $(SONAME): $(GENERATED) .depend $(OBJS) $(OBJASM) $(OBJSO) $(LD)$@ $(OBJS) $(OBJASM) $(OBJSO) $(SOFLAGS) $(LDFLAGS) ifneq ($(EXE),) -.PHONY: x264 checkasm +.PHONY: x264 checkasm example x264: x264$(EXE) checkasm: checkasm$(EXE) +example: example$(EXE) endif x264$(EXE): $(GENERATED) .depend $(OBJCLI) $(CLI_LIBX264) @@ -172,7 +204,10 @@ x264$(EXE): $(GENERATED) .depend $(OBJCLI) $(CLI_LIBX264) checkasm$(EXE): $(GENERATED) .depend $(OBJCHK) $(LIBX264) $(LD)$@ $(OBJCHK) $(LIBX264) $(LDFLAGS) -$(OBJS) $(OBJASM) $(OBJSO) $(OBJCLI) $(OBJCHK): .depend +example$(EXE): $(GENERATED) .depend $(OBJEXAMPLE) $(LIBX264) + $(LD)$@ $(OBJEXAMPLE) $(LIBX264) $(LDFLAGS) + +$(OBJS) $(OBJASM) $(OBJSO) $(OBJCLI) $(OBJCHK) $(OBJEXAMPLE): .depend %.o: %.asm common/x86/x86inc.asm common/x86/x86util.asm $(AS) $(ASFLAGS) -o $@ $< @@ -190,7 +225,12 @@ $(OBJS) $(OBJASM) $(OBJSO) $(OBJCLI) $(OBJCHK): .depend .depend: config.mak @rm -f .depend + @echo 'dependency file generation...' +ifeq ($(COMPILER),CL) + @$(foreach SRC, $(addprefix $(SRCPATH)/, $(SRCS) $(SRCCLI) $(SRCSO)), $(SRCPATH)/tools/msvsdepend.sh "$(CC)" "$(CFLAGS)" "$(SRC)" "$(SRC:$(SRCPATH)/%.c=%.o)" 1>> .depend;) +else @$(foreach SRC, $(addprefix $(SRCPATH)/, $(SRCS) $(SRCCLI) $(SRCSO)), $(CC) $(CFLAGS) $(SRC) $(DEPMT) $(SRC:$(SRCPATH)/%.c=%.o) $(DEPMM) 1>> .depend;) +endif config.mak: ./configure @@ -221,18 +261,24 @@ fprofiled: $(MAKE) clean $(MAKE) x264$(EXE) CFLAGS="$(CFLAGS) $(PROF_GEN_CC)" LDFLAGS="$(LDFLAGS) $(PROF_GEN_LD)" $(foreach V, $(VIDS), $(foreach I, 0 1 2 3 4 5 6 7, ./x264$(EXE) $(OPT$I) --threads 1 $(V) -o $(DEVNULL) ;)) +ifeq ($(COMPILER),CL) +# Because Visual Studio timestamps the object files within the PGD, it fails to build if they change - only the executable should be deleted + rm -f x264$(EXE) +else rm -f $(SRC2:%.c=%.o) +endif $(MAKE) CFLAGS="$(CFLAGS) $(PROF_USE_CC)" LDFLAGS="$(LDFLAGS) $(PROF_USE_LD)" - rm -f $(SRC2:%.c=%.gcda) $(SRC2:%.c=%.gcno) *.dyn pgopti.dpi pgopti.dpi.lock + rm -f $(SRC2:%.c=%.gcda) $(SRC2:%.c=%.gcno) *.dyn pgopti.dpi pgopti.dpi.lock *.pgd *.pgc endif clean: rm -f $(OBJS) $(OBJASM) $(OBJCLI) $(OBJSO) $(SONAME) *.a *.lib *.exp *.pdb x264 x264.exe .depend TAGS rm -f checkasm checkasm.exe $(OBJCHK) $(GENERATED) x264_lookahead.clbin - rm -f $(SRC2:%.c=%.gcda) $(SRC2:%.c=%.gcno) *.dyn pgopti.dpi pgopti.dpi.lock + rm -f example example.exe $(OBJEXAMPLE) + rm -f $(SRC2:%.c=%.gcda) $(SRC2:%.c=%.gcno) *.dyn pgopti.dpi pgopti.dpi.lock *.pgd *.pgc distclean: clean - rm -f config.mak x264_config.h config.h config.log x264.pc x264.def + rm -f config.mak x264_config.h config.h config.log x264.pc x264.def conftest* install-cli: cli $(INSTALL) -d $(DESTDIR)$(bindir)