X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.in;h=4ff17057ba8ae6f6d220de21c7da648584f32961;hb=3559b216df102fb518876e1d567e2a3558283d31;hp=c591dfdb2fad173cd5647d0ceaa8a9e157085a37;hpb=c6e29f22390eeba00e8504425eedbafb8b3722c1;p=movit diff --git a/Makefile.in b/Makefile.in index c591dfd..4ff1705 100644 --- a/Makefile.in +++ b/Makefile.in @@ -17,19 +17,19 @@ datarootdir = @datarootdir@ datadir = @datadir@ top_builddir = @top_builddir@ with_demo_app = @with_demo_app@ -with_SDL2 = @with_SDL2@ +with_benchmark = @with_benchmark@ with_coverage = @with_coverage@ CC=@CC@ CXX=@CXX@ -CXXFLAGS=-Wall @CXXFLAGS@ -fvisibility-inlines-hidden -I$(GTEST_DIR)/include @SDL2_CFLAGS@ @SDL_CFLAGS@ @Eigen3_CFLAGS@ @epoxy_CFLAGS@ @FFTW3_CFLAGS@ -ifeq ($(with_SDL2),yes) -CXXFLAGS += -DHAVE_SDL2 +CXXFLAGS=-Wall @CXXFLAGS@ -fvisibility-inlines-hidden -I$(GTEST_DIR)/include @SDL2_CFLAGS@ @Eigen3_CFLAGS@ @epoxy_CFLAGS@ @FFTW3_CFLAGS@ @benchmark_CFLAGS@ +ifeq ($(with_benchmark),yes) +CXXFLAGS += -DHAVE_BENCHMARK endif LDFLAGS=@LDFLAGS@ LDLIBS=@epoxy_LIBS@ @FFTW3_LIBS@ -lpthread -TEST_LDLIBS=@epoxy_LIBS@ @SDL2_LIBS@ @SDL_LIBS@ -lpthread -DEMO_LDLIBS=@SDL2_image_LIBS@ @SDL_image_LIBS@ -lrt -lpthread @libpng_LIBS@ @FFTW3_LIBS@ +TEST_LDLIBS=@epoxy_LIBS@ @SDL2_LIBS@ @benchmark_LIBS@ -lpthread +DEMO_LDLIBS=@SDL2_image_LIBS@ -lrt -lpthread @libpng_LIBS@ @FFTW3_LIBS@ SHELL=@SHELL@ LIBTOOL=@LIBTOOL@ --tag=CXX RANLIB=ranlib @@ -88,7 +88,7 @@ UNTESTED_EFFECTS += fft_input EFFECTS = $(TESTED_EFFECTS) $(UNTESTED_EFFECTS) # Unit tests. -TESTS=effect_chain_test fp16_test $(TESTED_INPUTS:=_test) $(TESTED_EFFECTS:=_test) +TESTS=effect_chain_test compute_shader_test fp16_test $(TESTED_INPUTS:=_test) $(TESTED_EFFECTS:=_test) LIB_OBJS=effect_util.o util.o effect.o effect_chain.o init.o resource_pool.o ycbcr.o $(INPUTS:=.o) $(EFFECTS:=.o)