Move pixel_format out of the ImageFormat struct, since it is only relevant for FlatInput.

[movit] / Makefile

diff --git a/Makefile b/Makefile
index 8e35cfa19198723b77bce663eb69e0afba764119..51aebc541159274202b538f4d0b4c2de831b4baf 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,32 @@
 CC=gcc
-CFLAGS=-std=gnu99 -Wall
+CXX=g++
+CXXFLAGS=-Wall -g
 LDFLAGS=-lSDL -lSDL_image -lGL
 
-test: test.o
-       $(CC) -o test test.o $(LDFLAGS)
+# Core.
+OBJS=main.o util.o widgets.o effect.o effect_chain.o flat_input.o
 
-.o: .c
-       $(CC) $(CXXFLAGS) $(CCFLAGS) -o $@ $<
+# Effects.
+OBJS += lift_gamma_gain_effect.o
+OBJS += gamma_expansion_effect.o
+OBJS += gamma_compression_effect.o
+OBJS += colorspace_conversion_effect.o
+OBJS += saturation_effect.o
+OBJS += vignette_effect.o
+OBJS += mirror_effect.o
+OBJS += blur_effect.o
+OBJS += diffusion_effect.o
+OBJS += glow_effect.o
+OBJS += mix_effect.o
+OBJS += sandbox_effect.o
+
+test: $(OBJS)
+       $(CXX) -o test $(OBJS) $(LDFLAGS)
+
+.o: .cpp
+       $(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $<
 
 clean:
-       $(RM) test test.o
+       $(RM) test $(OBJS)
 
 .PHONY: clean