Credit Andrew - updating patches for FFmpeg 7.0 as needed since 6.1, now at 7.0,...

[goodguy/cinelerra.git] / cinelerra-5.1 / libzmpeg3 / Makefile

diff --git a/cinelerra-5.1/libzmpeg3/Makefile b/cinelerra-5.1/libzmpeg3/Makefile
index b256c73686cad8864236fcab6c5cdab6739a20f3..d854fa974b2b76a47fe1cd4144e72624991ec655 100644 (file)
--- 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