added texturing

[chaz/rasterize] / Makefile

diff --git a/Makefile b/Makefile
index c186a65e61bbe9e12501da749971ac79c313cc44..a4ab26e6b055a8f2bb9bf9f1a68583e384bd3e04 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,23 +1,24 @@
 
-PROJECT = rasterize
-IUSE    = BACKFACE_CULLING BLENDING DEPTH_TEST EXTRA_INLINE NDEBUG \
-          CALC_NORMALS LIGHTING=3 SMOOTH_COLOR TEXTURING OPENGL
+PROJECT = raytrace
+IUSE    = EXTRA_INLINE SHADOWS TEXTURING QUIRKS
 
-CC      = gcc
+VIEWER  = feh
+
+CXX     = g++
 EXEEXT  =
-CFLAGS  = -std=c99 -O2 -g -pg
+CXXFLAGS= -O2 -g -pg
 CPPFLAGS= -MMD $(IUSE:%=-D%)
-LDLIBS  = -lm -lglut -lGL
+LDLIBS  = -lm
 
-SRCS    = main.c array.c common.c list.c model.c raster.c rbtree.c scene.c
-OBJS    = $(SRCS:%.c=%.o)
+SRCS    = main.cc common.cc list.cc raster.cc scene.cc
+OBJS    = $(SRCS:%.cc=%.o)
 DEPS    = $(OBJS:%.o=%.d)
 PROG    = $(PROJECT)$(EXEEXT)
 
 all: $(PROG)
 
 $(PROG): $(OBJS)
-       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDLIBS)
+       $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ $(LDLIBS)
 
 clean:
        rm -f $(PROG) $(OBJS) $(DEPS)
@@ -26,13 +27,13 @@ distclean: clean
        rm -f tags gmon.out
 
 realclean: distclean
-       rm -rf frames .*.raw .*.obj $(PROJECT).zip
+       rm -rf frames $(PROJECT).zip
 
 dist:
        git archive HEAD --prefix=$(PROJECT)/ --output=$(PROJECT).zip
 
 run: $(PROG)
-       ./$<
+       ./$< && $(VIEWER) scene.ppm
 
 debug: $(PROG)
        gdb ./$<