From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Thu, 13 Mar 2014 20:44:24 +0000 (+0100)
Subject: Merge branch 'master' into epoxy
X-Git-Tag: 1.1~12^2~31
X-Git-Url: https://git.sesse.net/?p=movit;a=commitdiff_plain;h=c5b9c3df43caa7a88f2f729a5c52359ca8ca537f;hp=-c

Merge branch 'master' into epoxy
---

c5b9c3df43caa7a88f2f729a5c52359ca8ca537f
diff --combined Makefile.in
index 3a2461f,8164e38..cefbf78
--- a/Makefile.in
+++ b/Makefile.in
@@@ -8,17 -8,13 +8,17 @@@ 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@
 -LDFLAGS=@GLEW_LIBS@ @SDL_LIBS@ -lpthread
 -DEMO_LDLIBS=@SDL_image_LIBS@ -lrt -lpthread @libpng_LIBS@
 +CXXFLAGS=-Wall @CXXFLAGS@ -I$(GTEST_DIR)/include @SDL2_CFLAGS@ @SDL_CFLAGS@ @Eigen3_CFLAGS@ @epoxy_CFLAGS@
 +ifeq ($(with_SDL2),yes)
 +CXXFLAGS += -DHAVE_SDL2
 +endif
 +LDFLAGS=@epoxy_LIBS@ @SDL2_LIBS@ @SDL_LIBS@ -lpthread
 +DEMO_LDLIBS=@SDL2_image_LIBS@ @SDL_image_LIBS@ -lrt -lpthread @libpng_LIBS@
  SHELL=@SHELL@
  LIBTOOL=@LIBTOOL@ --tag=CXX
  RANLIB=ranlib
@@@ -107,7 -103,8 +107,8 @@@ libmovit.la: $(LIB_OBJS:.o=.lo
  
  %.lo: %.cpp
  	$(LIBTOOL) --mode=compile $(CXX) -MMD -MP $(CPPFLAGS) $(CXXFLAGS) -o $@ -c $<
- 	sed 's/\.o:/\.lo:/' < $(@:.lo=.d) > $(@:.lo=.ld)
+ 	[ ! -r $(@:.lo=.d) ] || sed 's/\.o:/\.lo:/' < $(@:.lo=.d) > $(@:.lo=.ld)
+ 	[ ! -r .libs/$(@:.lo=.d) ] || sed 's/\.o:/\.lo:/' < .libs/$(@:.lo=.d) > .libs/$(@:.lo=.ld)
  %.o: %.cpp
  	$(CXX) -MMD -MP $(CPPFLAGS) $(CXXFLAGS) -o $@ -c $<
  
@@@ -143,7 -140,7 +144,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)
  
@@@ -152,6 -149,7 +153,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