Link against -lpng, since we can now write screenshots in PNG format.

[movit] / Makefile

diff --git a/Makefile b/Makefile
index 3d0a87cc47750e6d4da41d0b4036da4f438deeeb..c905c599393972fec0ce2b71046772967f2faf4c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ endif
 CC=gcc
 CXX=g++
 CXXFLAGS=-Wall -g -I$(GTEST_DIR)/include $(EIGEN_CXXFLAGS) $(GLEW_CXXFLAGS)
-LDFLAGS=-lSDL -lSDL_image -lGL -lrt -lpthread $(GLEW_LIBS)
+LDFLAGS=-lSDL -lSDL_image -lGL -lrt -lpthread -lpng $(GLEW_LIBS)
 RANLIB=ranlib
 
 ifeq ($(COVERAGE),1)
@@ -35,14 +35,18 @@ TESTS += overlay_effect_test
 TESTS += gamma_expansion_effect_test
 TESTS += gamma_compression_effect_test
 TESTS += colorspace_conversion_effect_test
+TESTS += alpha_multiplication_effect_test
+TESTS += alpha_division_effect_test
 TESTS += saturation_effect_test
 TESTS += deconvolution_sharpen_effect_test
 TESTS += blur_effect_test
 TESTS += unsharp_mask_effect_test
+TESTS += glow_effect_test
 TESTS += diffusion_effect_test
 TESTS += white_balance_effect_test
 TESTS += lift_gamma_gain_effect_test
 TESTS += resample_effect_test
+TESTS += padding_effect_test
 TESTS += dither_effect_test
 TESTS += flat_input_test
 TESTS += ycbcr_input_test
@@ -60,6 +64,8 @@ LIB_OBJS += white_balance_effect.o
 LIB_OBJS += gamma_expansion_effect.o
 LIB_OBJS += gamma_compression_effect.o
 LIB_OBJS += colorspace_conversion_effect.o
+LIB_OBJS += alpha_multiplication_effect.o
+LIB_OBJS += alpha_division_effect.o
 LIB_OBJS += saturation_effect.o
 LIB_OBJS += vignette_effect.o
 LIB_OBJS += mirror_effect.o
@@ -70,6 +76,7 @@ LIB_OBJS += unsharp_mask_effect.o
 LIB_OBJS += mix_effect.o
 LIB_OBJS += overlay_effect.o
 LIB_OBJS += resize_effect.o
+LIB_OBJS += padding_effect.o
 LIB_OBJS += resample_effect.o
 LIB_OBJS += dither_effect.o
 LIB_OBJS += deconvolution_sharpen_effect.o
@@ -112,11 +119,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