Merge branch 'simplify'

bozbalci · Jan 5, 2020 · 65b7054 · 65b7054
2 parents 9a5fff9 + 26f681c
commit 65b7054
Show file tree

Hide file tree

Showing 6 changed files with 563 additions and 582 deletions.
diff --git a/assignments/hw3/src/Giraffe.h b/assignments/hw3/src/Giraffe.h
diff --git a/assignments/hw3/src/Makefile b/assignments/hw3/src/Makefile
@@ -1,13 +1,13 @@
 CXX=g++
-CXXFLAGS=-std=c++17 -Wall
+CXXFLAGS=-std=c++17 -Wall -O3
 
 UNAME_S := $(shell uname -s)
 ifeq ($(UNAME_S),Linux)
 	LDFLAGS=-lGL -lglfw -lGLEW
 endif
 ifeq ($(UNAME_S),Darwin)
 	LDFLAGS=-framework OpenGL -lglfw
-	CXXFLAGS += -DAPPLE -DGL_SILENCE_DEPRECATION
+	CXXFLAGS += -DGL_SILENCE_DEPRECATION
 endif
 UBUNTU_S := $(shell $(CXX) --version | grep -i ubuntu >/dev/null; echo $$?)
 ifeq ($(UBUNTU_S),0)
@@ -16,8 +16,8 @@ endif
 
 all: hw3_flat
 
-hw3_flat: flat.cpp util.cpp Giraffe.h
-	$(CXX) flat.cpp util.cpp -o hw3_flat $(CXXFLAGS) $(LDFLAGS)
+hw3_flat: flat.cpp
+	$(CXX) flat.cpp -o hw3_flat $(CXXFLAGS) $(LDFLAGS)
 
 clean:
 	rm -f *.o hw3_flat