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

diff --git a/Makefile b/Makefile
index 8ad8c2d..02d1980 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,35 @@
-GTEST_DIR = /usr/src/gtest
+GTEST_DIR ?= /usr/src/gtest
 
 EIGEN_CXXFLAGS := $(shell pkg-config --cflags eigen3)
 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
+
+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)
-LDFLAGS=-lSDL -lSDL_image -lGL -lrt -lpthread
+CXXFLAGS=-Wall -g -I$(GTEST_DIR)/include $(EIGEN_CXXFLAGS) $(GLEW_CXXFLAGS)
+LDFLAGS=$(GLEW_LIBS) $(SDL_LIBS)
+DEMO_LDFLAGS=-lSDL_image -lrt -lpthread -lpng
 RANLIB=ranlib
 
 ifeq ($(COVERAGE),1)
@@ -21,23 +42,28 @@ 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
+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
 
 # Core.
-LIB_OBJS=util.o widgets.o effect.o effect_chain.o init.o
+LIB_OBJS=effect_util.o util.o widgets.o effect.o effect_chain.o init.o
 
 # Inputs.
 LIB_OBJS += flat_input.o
@@ -49,6 +75,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
@@ -57,7 +85,9 @@ 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 += padding_effect.o
 LIB_OBJS += resample_effect.o
 LIB_OBJS += dither_effect.o
 LIB_OBJS += deconvolution_sharpen_effect.o
@@ -82,7 +112,7 @@ OBJS=$(DEMO_OBJS) $(LIB_OBJS) $(TEST_OBJS) $(TESTS:=.o)
 
 # A small demo program.
 demo: libmovit.a $(DEMO_OBJS)
-	$(CXX) -o demo $(DEMO_OBJS) libmovit.a $(LDFLAGS)
+	$(CXX) -o demo $(DEMO_OBJS) libmovit.a $(LDFLAGS) $(DEMO_LDFLAGS)
 
 # The library itself.
 libmovit.a: $(LIB_OBJS)
@@ -90,7 +120,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 +130,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