projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Credit ffmpeg team with upgrade to 6.1
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
mpeg2enc
/
Makefile
diff --git
a/cinelerra-5.1/mpeg2enc/Makefile
b/cinelerra-5.1/mpeg2enc/Makefile
index 80e0f8f939f3d38453287f81947fb8dfbcd4123a..f517e52f68093d6fa98a9b428b336c4e254cfc50 100644
(file)
--- a/
cinelerra-5.1/mpeg2enc/Makefile
+++ b/
cinelerra-5.1/mpeg2enc/Makefile
@@
-7,7
+7,7
@@
CC = gcc
CFLAGS += -I$(TOPDIR)/libzmpeg3
ifeq ($(OBJDIR), i686)
CFLAGS += -I$(TOPDIR)/libzmpeg3
ifeq ($(OBJDIR), i686)
-CFLAGS += -DX86_CPU
+CFLAGS += -DX86_CPU
-march=i686 -mcpu=i686 -fomit-frame-pointer
NASMOBJ = \
$(OBJDIR)/bdist1_mmx.o \
$(OBJDIR)/bdist2_mmx.o \
NASMOBJ = \
$(OBJDIR)/bdist1_mmx.o \
$(OBJDIR)/bdist2_mmx.o \
@@
-56,6
+56,13
@@
OBJ = \
LIBS := $(LIBZMPEG3)/$(OBJDIR)/libzmpeg3.a
LIBS += $(libraries)
LIBS := $(LIBZMPEG3)/$(OBJDIR)/libzmpeg3.a
LIBS += $(libraries)
+ifeq ($(WANT_CIN_3RDPARTY),no)
+LIBS += -la52
+endif
+ifeq ($(shell uname -o), Android)
+LIBS += ../libbthread-master/jpt.a
+endif
+
HVEG2LIB = $(OBJDIR)/hveg2enc.a
HVEG2ENC = $(OBJDIR)/hveg2enc
HVEG2ENC_G = $(OBJDIR)/hveg2enc_g
HVEG2LIB = $(OBJDIR)/hveg2enc.a
HVEG2ENC = $(OBJDIR)/hveg2enc
HVEG2ENC_G = $(OBJDIR)/hveg2enc_g