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=5b6ab865efa692b25590f302c111b30680fbacdd

Merge branch 'master' into epoxy
---

diff --git a/Makefile.in b/Makefile.in
index 3a2461f..cefbf78 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -107,7 +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 +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 +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