projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
textbox cursor fix, h265 param files, bluray updates, new-proj theme fixes
[goodguy/history.git]
/
cinelerra-5.1
/
libzmpeg3
/
Makefile
diff --git
a/cinelerra-5.1/libzmpeg3/Makefile
b/cinelerra-5.1/libzmpeg3/Makefile
index 3d0d481c65006c44d779a15b77e21620adcffe8c..a1f0ce2c4eb143600cc74c1784471eb005eb63ce 100644
(file)
--- a/
cinelerra-5.1/libzmpeg3/Makefile
+++ b/
cinelerra-5.1/libzmpeg3/Makefile
@@
-1,15
+1,13
@@
-TOPDIR ?= $(CURDIR)/..
-export TOPDIR
+export TOPDIR ?= $(CURDIR)/..
include $(TOPDIR)/global_config
CC = gcc
NASM = nasm
USE_MMX ?= 0
include $(TOPDIR)/global_config
CC = gcc
NASM = nasm
USE_MMX ?= 0
-USE_CSS ?= 1
DYNAMIC_FONTS ?= 1
ifeq ($(OBJDIR), alpha)
DYNAMIC_FONTS ?= 1
ifeq ($(OBJDIR), alpha)
- ifneq ($(
HAVE_CFLAGS), y
)
+ ifneq ($(
origin CFLAGS), environment
)
CFLAGS := -O4 -arch ev67 -ieee -accept c99_keywords -gcc_messages
endif
endif
CFLAGS := -O4 -arch ev67 -ieee -accept c99_keywords -gcc_messages
endif
endif
@@
-21,7
+19,6
@@
ifeq ($(USE_MMX), 1)
endif
CFLAGS += -I. $(inc_a52dec)
endif
CFLAGS += -I. $(inc_a52dec)
-CFLAGS += -Wall
OBJS = \
$(OBJDIR)/audio/ac3.o \
OBJS = \
$(OBJDIR)/audio/ac3.o \
@@
-64,9
+61,12
@@
OBJS = \
$(OBJDIR)/toc.o \
$(OBJDIR)/mpeg3.o \
$(OBJDIR)/toc.o \
$(OBJDIR)/mpeg3.o \
+$(shell mkdir -p $(OBJDIR) )
+
DIRS := \
$(OBJDIR)/audio \
$(OBJDIR)/video
DIRS := \
$(OBJDIR)/audio \
$(OBJDIR)/video
+$(shell mkdir -p $(DIRS) )
OUTPUT = $(OBJDIR)/libzmpeg3.a
UTILS += $(OBJDIR)/mpeg3toc
OUTPUT = $(OBJDIR)/libzmpeg3.a
UTILS += $(OBJDIR)/mpeg3toc
@@
-75,11
+75,9
@@
UTILS += $(OBJDIR)/mpeg3cat
UTILS += $(OBJDIR)/mpeg3ifochk
UTILS += $(OBJDIR)/mpeg3cc2txt
UTILS += $(OBJDIR)/mpeg3ifochk
UTILS += $(OBJDIR)/mpeg3cc2txt
-#$(OBJDIR)/mpeg3split
-
LIBS = -lm -lpthread
LIBS = -lm -lpthread
-LIBS += $(lib_a52dec)
+LIBS += $(lib_a52dec)
$(lib_djbfft)
ifeq ($(DYNAMIC_FONTS), 1)
LIBS += -lX11
ifeq ($(DYNAMIC_FONTS), 1)
LIBS += -lX11
@@
-88,11
+86,8
@@
CFLAGS += -DBUILTIN_FONT_DATA
OBJS += $(OBJDIR)/xfont1.o
endif
OBJS += $(OBJDIR)/xfont1.o
endif
-$(shell mkdir -p $(OBJDIR) )
-
$(shell echo $(CFLAGS) > $(OBJDIR)/c_flags)
$(shell echo $(OBJS) $(ASMOBJS) $(NASMOBJS) > $(OBJDIR)/objs)
$(shell echo $(CFLAGS) > $(OBJDIR)/c_flags)
$(shell echo $(OBJS) $(ASMOBJS) $(NASMOBJS) > $(OBJDIR)/objs)
-$(shell mkdir -p $(DIRS) )
all: $(OUTPUT) $(UTILS)
all: $(OUTPUT) $(UTILS)