-CFLAGS += -I../..
+CFLAGS := -I../.. $(CFLAGS)
LDFLAGS += -L../../framework -lmlt -lm
CPPOBJS += filter_movit_vignette.o
CPPOBJS += filter_movit_white_balance.o
CPPOBJS += mlt_movit_input.o
+CPPOBJS += transition_movit_luma.o
CPPOBJS += transition_movit_mix.o
CPPOBJS += transition_movit_overlay.o
-CXXFLAGS += -Wno-deprecated $(CFLAGS)
+CXXFLAGS := -Wno-deprecated $(CFLAGS) $(CXXFLAGS)
CXXFLAGS += $(shell pkg-config --cflags movit 2> /dev/null)
SHADERDIR = $(shell pkg-config --variable=shaderdir movit)
ifeq ($(targetos), MinGW)
CXXFLAGS += $(shell pkg-config --cflags glew)
- LDFLAGS += -lmovit $(shell pkg-config --libs-only-L glew) -lglew32 -lopengl32
+ LDFLAGS += -lmovit $(shell pkg-config --libs-only-L glew) -lglew32 -lopengl32 -lpthread
else
- LDFLAGS += $(shell pkg-config --libs movit 2> /dev/null)
+ LDFLAGS += $(shell pkg-config --static --libs movit 2> /dev/null)
ifeq ($(targetos), Darwin)
CXXFLAGS += -FOpenGL
- LDFLAGS += -framework OpenGL
+ LDFLAGS += -lpthread -framework OpenGL
else
OBJS += consumer_xgl.o
LDFLAGS += -lpthread -lGL -lX11