solution for assignment 2.1

[MicroTrace.git] / Makefile

diff --git a/Makefile b/Makefile
index a9c458e..982c074 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,19 +3,34 @@
 all: MicroTrace
 
 CC = g++ 
 all: MicroTrace
 
 CC = g++ 

-CFLAGS = -O3 -Wall -g -O0
+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 $@
 

+%.a:
+       ar r $@ $<
+
+
+

 MicroTrace: $(OBJ)
 
 clean: 
 MicroTrace: $(OBJ)
 
 clean: 

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