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

diff --git a/Makefile b/Makefile
index ad886c0..cea2234 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-GTEST_DIR = /usr/src/gtest
+GTEST_DIR ?= /usr/src/gtest
 
 EIGEN_CXXFLAGS := $(shell pkg-config --cflags eigen3)
 ifeq ($(EIGEN_CXXFLAGS),)
@@ -15,10 +15,20 @@ ifeq ($(GLEW_LIBS),)
 $(error Empty GLEW_LIBS. You probably need to install GLEW)
 endif
 
+SDL_CXXFLAGS := $(shell sdl-config --cflags)
+ifeq ($(SDL_CXXFLAGS),)
+$(error Empty SDL_CXXFLAGS. You probably need to install SDL)
+endif
+
+SDL_LIBS := $(shell sdl-config --libs)
+ifeq ($(SDL_LIBS),)
+$(error Empty SDL_LIBS. You probably need to install SDL)
+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) $(SDL_LIBS)
 RANLIB=ranlib
 
 ifeq ($(COVERAGE),1)
@@ -35,14 +45,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 +74,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 +86,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