X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=Makefile.in;h=7181a1d4699c10495da0271948ae87b076fea11f;hp=93318cfd608bcd026965f814d45a34c296b27a47;hb=28af8fc2975dd3ea2e202da283a1b52c685cd62e;hpb=0597b51d28b5f095931c54a5e5f90ed9d5e18790 diff --git a/Makefile.in b/Makefile.in index 93318cf..7181a1d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,5 +1,13 @@ GTEST_DIR ?= /usr/src/gtest +# This will be upgraded for each release, although not necessarily for every git commit. +# See http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html +# for the rules as of how this is changed. This does not really mean that Movit will +# 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:0:0 + prefix = @prefix@ exec_prefix = @exec_prefix@ includedir = @includedir@ @@ -12,9 +20,9 @@ with_coverage = @with_coverage@ CC=@CC@ CXX=@CXX@ -CXXFLAGS=-Wall @CXXFLAGS@ -I$(GTEST_DIR)/include @Eigen3_CFLAGS@ @GLEW_CFLAGS@ -LDFLAGS=@GLEW_LIBS@ @SDL_LIBS@ -lpthread -DEMO_LDLIBS=@SDL_image_LIBS@ -lrt -lpthread @libpng_LIBS@ +CXXFLAGS=-Wall @CXXFLAGS@ -I$(GTEST_DIR)/include @Eigen3_CFLAGS@ @GLEW_CFLAGS@ @FFTW3_CFLAGS@ +LDFLAGS=@GLEW_LIBS@ @SDL_LIBS@ @FFTW3_LIBS@ -lpthread +DEMO_LDLIBS=@SDL_image_LIBS@ -lrt -lpthread @libpng_LIBS@ @FFTW3_LIBS@ SHELL=@SHELL@ LIBTOOL=@LIBTOOL@ --tag=CXX RANLIB=ranlib @@ -59,11 +67,13 @@ TESTED_EFFECTS += vignette_effect TESTED_EFFECTS += slice_effect TESTED_EFFECTS += complex_modulate_effect TESTED_EFFECTS += luma_mix_effect +TESTED_EFFECTS += fft_convolution_effect UNTESTED_EFFECTS = sandbox_effect UNTESTED_EFFECTS += mirror_effect UNTESTED_EFFECTS += resize_effect UNTESTED_EFFECTS += multiply_effect +UNTESTED_EFFECTS += fft_input EFFECTS = $(TESTED_EFFECTS) $(UNTESTED_EFFECTS) @@ -99,7 +109,7 @@ demo: libmovit.la $(DEMO_OBJS) # The library itself. libmovit.la: $(LIB_OBJS:.o=.lo) - $(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -rpath $(libdir) -o $@ $^ $(LDLIBS) + $(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -rpath $(libdir) -version-info $(movit_ltversion) -o $@ $^ $(LDLIBS) %.lo: %.cpp $(LIBTOOL) --mode=compile $(CXX) -MMD -MP $(CPPFLAGS) $(CXXFLAGS) -o $@ -c $< @@ -140,7 +150,7 @@ coverage: @exit 1 endif -HDRS = effect_chain.h effect_util.h effect.h input.h image_format.h init.h util.h defs.h resource_pool.h +HDRS = effect_chain.h effect_util.h effect.h input.h image_format.h init.h util.h defs.h resource_pool.h fp16.h HDRS += $(INPUTS:=.h) HDRS += $(EFFECTS:=.h) @@ -149,6 +159,7 @@ SHADERS += $(INPUTS:=.frag) SHADERS += $(EFFECTS:=.frag) SHADERS += highlight_cutoff_effect.frag SHADERS += overlay_matte_effect.frag +SHADERS += texture1d.frag # These purposefully do not exist. MISSING_SHADERS = diffusion_effect.frag glow_effect.frag unsharp_mask_effect.frag resize_effect.frag