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 c5b8a083d37ac3ebd173b1d83bd19c89a027bd24..d854fa974b2b76a47fe1cd4144e72624991ec655 100644 (file)
--- a/cinelerra-5.1/libzmpeg3/Makefile
+++ b/cinelerra-5.1/libzmpeg3/Makefile
@@ -83,13 +83,13 @@ ifeq ($(WANT_CIN_3RDPARTY),no)
 LIBS += -la52
 endif
 ifeq ($(shell uname -o), Android)
-LIBS += jpt.a
+LIBS += ../libbthread-master/jpt.a
 endif
 
 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