Added an overlay effect, implementing the atop effect.

[movit] / Makefile

diff --git a/Makefile b/Makefile
index 1ab3d9cce46d84d754060e2e207fa0a95a068f70..3d0a87cc47750e6d4da41d0b4036da4f438deeeb 100644 (file)
--- 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
@@ -75,37 +87,7 @@ gtest_sdl_main.o: gtest_sdl_main.cpp
        $(CXX) -MMD $(CPPFLAGS) -I$(GTEST_DIR) $(CXXFLAGS) -c $< -o $@
 
 # Unit tests.
-effect_chain_test: effect_chain_test.o $(TEST_OBJS) libmovit.a
-       $(CXX) -o $@ $^ $(LDFLAGS)
-mix_effect_test: mix_effect_test.o $(TEST_OBJS) libmovit.a
-       $(CXX) -o $@ $^ $(LDFLAGS)
-gamma_expansion_effect_test: gamma_expansion_effect_test.o $(TEST_OBJS) libmovit.a
-       $(CXX) -o $@ $^ $(LDFLAGS)
-gamma_compression_effect_test: gamma_compression_effect_test.o $(TEST_OBJS) libmovit.a
-       $(CXX) -o $@ $^ $(LDFLAGS)
-colorspace_conversion_effect_test: colorspace_conversion_effect_test.o $(TEST_OBJS) libmovit.a
-       $(CXX) -o $@ $^ $(LDFLAGS)
-saturation_effect_test: saturation_effect_test.o $(TEST_OBJS) libmovit.a
-       $(CXX) -o $@ $^ $(LDFLAGS)
-deconvolution_sharpen_effect_test: deconvolution_sharpen_effect_test.o $(TEST_OBJS) libmovit.a
-       $(CXX) -o $@ $^ $(LDFLAGS)
-blur_effect_test: blur_effect_test.o $(TEST_OBJS) libmovit.a
-       $(CXX) -o $@ $^ $(LDFLAGS)
-unsharp_mask_effect_test: unsharp_mask_effect_test.o $(TEST_OBJS) libmovit.a
-       $(CXX) -o $@ $^ $(LDFLAGS)
-diffusion_effect_test: diffusion_effect_test.o $(TEST_OBJS) libmovit.a
-       $(CXX) -o $@ $^ $(LDFLAGS)
-white_balance_effect_test: white_balance_effect_test.o $(TEST_OBJS) libmovit.a
-       $(CXX) -o $@ $^ $(LDFLAGS)
-lift_gamma_gain_effect_test: lift_gamma_gain_effect_test.o $(TEST_OBJS) libmovit.a
-       $(CXX) -o $@ $^ $(LDFLAGS)
-resample_effect_test: resample_effect_test.o $(TEST_OBJS) libmovit.a
-       $(CXX) -o $@ $^ $(LDFLAGS)
-dither_effect_test: dither_effect_test.o $(TEST_OBJS) libmovit.a
-       $(CXX) -o $@ $^ $(LDFLAGS)
-flat_input_test: flat_input_test.o $(TEST_OBJS) libmovit.a
-       $(CXX) -o $@ $^ $(LDFLAGS)
-ycbcr_input_test: ycbcr_input_test.o $(TEST_OBJS) libmovit.a
+$(TESTS): %: %.o $(TEST_OBJS) libmovit.a
        $(CXX) -o $@ $^ $(LDFLAGS)
 
 OBJS=$(DEMO_OBJS) $(LIB_OBJS) $(TEST_OBJS) $(TESTS:=.o)
@@ -120,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)