code for assignment 4, gitignored *.ppm, *.png

[MicroTrace.git] / Makefile

diff --git a/Makefile b/Makefile
index a9c458e..ac86170 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,19 +3,41 @@
 all: MicroTrace
 
 CC = g++ 
-CFLAGS = -O3 -Wall -g -O0
+CFLAGS = -O3 -Wall -fopenmp
+
 
 OBJ = MicroTrace.o\
       Vec3f.o\
       Camera.o\
       PerspectiveCamera.o\
+      Ray.o\
       Image.o\
-      Ray.o
+      InfinitePlane.o\
+      Sphere.o\
+      Triangle.o\
+      Shader.o\
+      FlatShader.o\
+      EyeLightShader.o\
+      ReflectiveEyeLightShader.o\
+      PhongShader.o\
+      Light.o\
+      PointLight.o\
+      SpotLight.o\
+      Scene.o\
+      Primitive.o\
+      QuadAreaLight.o\
+      Box.o\
+      kDTree.o
 
 %.o: %.cxx *.hxx
        $(CC) $(CFLAGS) -c $< -o $@
 
-MicroTrace: $(OBJ)
+%.a:
+       ar r $@ $<
+
 
+
+MicroTrace: $(OBJ)
+       g++  -fopenmp $(OBJ) -o MicroTrace
 clean: 
-       rm *.o MicroTrace
+       rm *~ *.o *.a MicroTrace