Add a little hack for linking against Movit with epoxy.

[mlt] / src / modules / opengl / Makefile

diff --git a/src/modules/opengl/Makefile b/src/modules/opengl/Makefile
index 1e61e0edde886ebc0bc89aa54c9e4b6fd2e19808..7a55c6cb3ecf97023c75ec789210682488bc5b52 100644 (file)
--- a/src/modules/opengl/Makefile
+++ b/src/modules/opengl/Makefile
@@ -1,4 +1,4 @@
-CFLAGS += -I../..
+CFLAGS := -I../.. $(CFLAGS)
 
 LDFLAGS += -L../../framework -lmlt -lm
 
@@ -8,8 +8,7 @@ TARGET = ../libmltopengl$(LIBSUF)
 
 OBJS = factory.o
 
-CPPOBJS = fbo_input.o
-CPPOBJS += filter_glsl_manager.o
+CPPOBJS = filter_glsl_manager.o
 CPPOBJS += filter_movit_blur.o
 CPPOBJS += filter_movit_convert.o
 CPPOBJS += filter_movit_crop.o
@@ -26,10 +25,11 @@ CPPOBJS += filter_movit_saturation.o
 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)
@@ -39,12 +39,12 @@ LDFLAGS += -L../../mlt++ -lmlt++
 
 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