X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=Makefile;h=ad886c0eb5950dd603e716cf66c3e5141e34f7e0;hp=8ad8c2d2df1c4efb7d59622c8178fa72642b4ee4;hb=96591ba1b5bffa57724fa90e13d1f2cdc810ccd5;hpb=45b3cd2369f829dda090a32a7eb3ce5fc4b362b3

diff --git a/Makefile b/Makefile
index 8ad8c2d..ad886c0 100644
--- a/Makefile
+++ b/Makefile
@@ -5,10 +5,20 @@ ifeq ($(EIGEN_CXXFLAGS),)
 $(error Empty EIGEN_CXXFLAGS. You probably need to install Eigen3)
 endif
 
+GLEW_CXXFLAGS := $(shell pkg-config --cflags glew)
+ifeq ($(GLEW_CXXFLAGS),)
+$(error Empty GLEW_CXXFLAGS. You probably need to install GLEW)
+endif
+
+GLEW_LIBS := $(shell pkg-config --libs glew)
+ifeq ($(GLEW_LIBS),)
+$(error Empty GLEW_LIBS. You probably need to install GLEW)
+endif
+
 CC=gcc
 CXX=g++
-CXXFLAGS=-Wall -g -I$(GTEST_DIR)/include $(EIGEN_CXXFLAGS)
-LDFLAGS=-lSDL -lSDL_image -lGL -lrt -lpthread
+CXXFLAGS=-Wall -g -I$(GTEST_DIR)/include $(EIGEN_CXXFLAGS) $(GLEW_CXXFLAGS)
+LDFLAGS=-lSDL -lSDL_image -lGL -lrt -lpthread $(GLEW_LIBS)
 RANLIB=ranlib
 
 ifeq ($(COVERAGE),1)
@@ -21,6 +31,7 @@ DEMO_OBJS=demo.o
 # Unit tests.
 TESTS=effect_chain_test
 TESTS += mix_effect_test
+TESTS += overlay_effect_test
 TESTS += gamma_expansion_effect_test
 TESTS += gamma_compression_effect_test
 TESTS += colorspace_conversion_effect_test
@@ -57,6 +68,7 @@ LIB_OBJS += diffusion_effect.o
 LIB_OBJS += glow_effect.o
 LIB_OBJS += unsharp_mask_effect.o
 LIB_OBJS += mix_effect.o
+LIB_OBJS += overlay_effect.o
 LIB_OBJS += resize_effect.o
 LIB_OBJS += resample_effect.o
 LIB_OBJS += dither_effect.o
@@ -90,7 +102,7 @@ libmovit.a: $(LIB_OBJS)
 	$(RANLIB) $@
 
 %.o: %.cpp
-	$(CXX) -MMD $(CPPFLAGS) $(CXXFLAGS) -o $@ -c $<
+	$(CXX) -MMD -MP $(CPPFLAGS) $(CXXFLAGS) -o $@ -c $<
 
 DEPS=$(OBJS:.o=.d)
 -include $(DEPS)
@@ -100,11 +112,14 @@ clean:
 	$(RM) -r movit.info coverage/
 
 check: $(TESTS)
-	FAIL=0; \
+	FAILED_TESTS=""; \
 	for TEST in $(TESTS); do \
-	    ./$$TEST || FAIL=1; \
+	    ./$$TEST || FAILED_TESTS="$$TEST $$FAILED_TESTS"; \
 	done; \
-	exit $$FAIL
+	if [ "$$FAILED_TESTS" ]; then \
+		echo Failed tests: $$FAILED_TESTS; \
+		exit 1; \
+	fi
 
 # You need to build with COVERAGE=1 to use this target.
 coverage: check