X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=Makefile.in;h=69fa663c787d254d0379ec463553f062eea5a7e4;hp=b0c9889808ce9deba4ced7df42cad6bd15e829c6;hb=cef6dcbc9ebaceb7b0cb47d6a519cb08a390c358;hpb=6b087c6405258efe9761bcf1f2b8a68d1787c372 diff --git a/Makefile.in b/Makefile.in index b0c9889..69fa663 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 = 1:2:0 -movit_version = 1.0.2 +movit_ltversion = 1:3:0 +movit_version = 1.0.3 prefix = @prefix@ exec_prefix = @exec_prefix@ @@ -17,15 +17,19 @@ datarootdir = @datarootdir@ datadir = @datadir@ top_builddir = @top_builddir@ with_demo_app = @with_demo_app@ +with_SDL2 = @with_SDL2@ with_coverage = @with_coverage@ CC=@CC@ CXX=@CXX@ -CXXFLAGS=-Wall @CXXFLAGS@ -I$(GTEST_DIR)/include @Eigen3_CFLAGS@ @GLEW_CFLAGS@ @FFTW3_CFLAGS@ +CXXFLAGS=-Wall @CXXFLAGS@ -I$(GTEST_DIR)/include @SDL2_CFLAGS@ @SDL_CFLAGS@ @Eigen3_CFLAGS@ @epoxy_CFLAGS@ @FFTW3_CFLAGS@ +ifeq ($(with_SDL2),yes) +CXXFLAGS += -DHAVE_SDL2 +endif LDFLAGS=@LDFLAGS@ -LDLIBS=@GLEW_LIBS@ @FFTW3_LIBS@ -lpthread -TEST_LDLIBS=@GLEW_LIBS@ @SDL_LIBS@ -lpthread -DEMO_LDLIBS=@SDL_image_LIBS@ -lrt -lpthread @libpng_LIBS@ @FFTW3_LIBS@ +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@ SHELL=@SHELL@ LIBTOOL=@LIBTOOL@ --tag=CXX RANLIB=ranlib @@ -182,7 +186,7 @@ install: libmovit.la $(INSTALL) -m 644 movit.pc $(DESTDIR)$(libdir)/pkgconfig/ DISTDIR=movit-$(movit_version) -OTHER_DIST_FILES=add.frag autogen.sh blue.frag configure.ac d65.h effectlist.txt identity.frag invert_effect.frag Makefile.in mipmap_needing_effect.frag movit.pc.in README NEWS test_util.h widgets.h +OTHER_DIST_FILES=add.frag autogen.sh blue.frag configure.ac d65.h identity.frag invert_effect.frag Makefile.in mipmap_needing_effect.frag movit.pc.in README NEWS test_util.h widgets.h dist: $(MKDIR) $(DISTDIR)