X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Flibzmpeg3%2FMakefile;h=d854fa974b2b76a47fe1cd4144e72624991ec655;hb=b7f6f61e450ed50974930a07e0337f07c120f29d;hp=b256c73686cad8864236fcab6c5cdab6739a20f3;hpb=7fd85fb66168f6b518c5f2d73e04036e87faa0e1;p=goodguy%2Fcinelerra.git diff --git a/cinelerra-5.1/libzmpeg3/Makefile b/cinelerra-5.1/libzmpeg3/Makefile index b256c736..d854fa97 100644 --- a/cinelerra-5.1/libzmpeg3/Makefile +++ b/cinelerra-5.1/libzmpeg3/Makefile @@ -3,7 +3,8 @@ include $(TOPDIR)/global_config ifneq ($(WANT_LIBZMPEG),no) -CC = gcc +# for mmx inlines +#CC = gcc NASM = nasm USE_MMX ?= 0 DYNAMIC_FONTS ?= 1 @@ -78,11 +79,17 @@ UTILS += $(OBJDIR)/zmpeg3ifochk UTILS += $(OBJDIR)/zmpeg3cc2txt LIBS = -lm -lpthread +ifeq ($(WANT_CIN_3RDPARTY),no) +LIBS += -la52 +endif +ifeq ($(shell uname -o), Android) +LIBS += ../libbthread-master/jpt.a +endif -LIBS += $(lib_a52dec) $(lib_djbfft) +LIBS += $(lib_a52dec) $(lib_djbfft) $(lib_libbthread) ifeq ($(DYNAMIC_FONTS), 1) -LIBS += -lX11 +LIBS += -lX11 `pkg-config --libs x11` else CFLAGS += -DBUILTIN_FONT_DATA OBJS += $(OBJDIR)/xfont1.o