added make clean, make all to .cproject

[MicroTrace.git] / Makefile

diff --git a/Makefile b/Makefile
index 2223440..982c074 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,12 +5,22 @@ all: MicroTrace
 CC = g++ 
 CFLAGS = -O3 -Wall
 
 CC = g++ 
 CFLAGS = -O3 -Wall
 

+

 OBJ = MicroTrace.o\
       Vec3f.o\
       Camera.o\
       PerspectiveCamera.o\
 OBJ = MicroTrace.o\
       Vec3f.o\
       Camera.o\
       PerspectiveCamera.o\

+      Ray.o\

       Image.o\
       Image.o\

-      Ray.o
+      InfinitePlane.o\
+      Sphere.o\
+      Triangle.o\
+      Shader.o\
+      FlatShader.o\
+      EyeLightShader.o\
+      ReflectiveEyeLightShader.o\
+      Scene.o\
+      Primitive.o

 
 %.o: %.cxx *.hxx
        $(CC) $(CFLAGS) -c $< -o $@
 
 %.o: %.cxx *.hxx
        $(CC) $(CFLAGS) -c $< -o $@


@@ -23,4 +33,4 @@ OBJ = MicroTrace.o\
 MicroTrace: $(OBJ)
 
 clean: 
 MicroTrace: $(OBJ)
 
 clean: 

-       rm *.o *.a MicroTrace
+       rm *~ *.o *.a MicroTrace