X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=Makefile.in;h=c25d77dcda76d1bdb06458557a63c590f6a088b5;hp=f26da6b145bd0c0033001827a178daf90d841f52;hb=beef8c4b242dd9e073f04b80539a10295417ced5;hpb=7ff8195d27166151be38d637ae4b2633d4b39556 diff --git a/Makefile.in b/Makefile.in index f26da6b..c25d77d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -6,8 +6,8 @@ GTEST_DIR ?= /usr/src/gtest # strive towards having a rock-stable ABI, but at least the soversion will increase # whenever it breaks, so that you will not have silent failures, and distribution package # management can run its course. -movit_ltversion = 7:0:1 -movit_version = 1.5.1 +movit_ltversion = 7:1:0 +movit_version = 1.5.3 prefix = @prefix@ exec_prefix = @exec_prefix@ @@ -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