X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=Makefile;h=02d1980a186fb52b69112e0fa6c150af2a1e5364;hp=306a730adef46fed79efae373d4640dac13506e1;hb=46cec0349282daa06df45279fb5d4e49add461ae;hpb=eddc371976d7586176a74503ec9896159ececa43

diff --git a/Makefile b/Makefile
index 306a730..02d1980 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,21 @@ 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=$(GLEW_LIBS) $(SDL_LIBS)
+DEMO_LDFLAGS=-lSDL_image -lrt -lpthread -lpng
 RANLIB=ranlib
 
 ifeq ($(COVERAGE),1)
@@ -41,6 +52,7 @@ 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
@@ -51,7 +63,7 @@ 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
@@ -100,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)