From 3c8eabf673b934b7bf21e07a6b9b15ba7c45d2fd Mon Sep 17 00:00:00 2001
From: SoloArchx250 <SolomonWagner@protonmail.com>
Date: Wed, 13 May 2020 23:19:15 -0400
Subject: [PATCH] revert to working makefile

---
 Makefile     | 44 +++++++++++++++++++++++++++++++++++++++++---
 Makefile.bak | 40 ----------------------------------------
 2 files changed, 41 insertions(+), 43 deletions(-)
 delete mode 100644 Makefile.bak

diff --git a/Makefile b/Makefile
index aeb088a..3b24835 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,42 @@
-goals = bin/main.o bin/Cube.o bin/Color.o bin/Quad.o bin/Vertex.o
-targets = $(patsubst bin/%.o, src/%.cpp, $(goals))
+LINK = -lstdc++ -lSDL2 -lOpenGL -lGLEW -lGLU
+DBG = -Wall
+CC := clang $(DBG) -c
 
-$(goals): $(targets) ;
+all: build ;
+
+goals = bin/main.o bin/Cube.o bin/Color.o bin/Quad.o bin/Vertex.o
+
+define pro =
+$(CC) -c $^ -o $@
+endef
+
+bin/main.o: src/main.cpp
+	$(pro)
+bin/Cube.o: src/Cube.cpp
+	$(pro)
+bin/Color.o: src/Color.cpp
+	$(pro)
+bin/Quad.o: src/Quad.cpp
+	$(pro)
+bin/Vertex.o: src/Vertex.cpp
+	$(pro)
+#targets = $(patsubst bin/%.o,src/%.cpp,$(goals))
+#$(goals): $(targets) ;
+#	$(foreach goal,$(goals),$( \
+#		$(CC) $(patsubst bin/%.o, src/%.cpp, $(goal)) \
+#		echo $(goal) \
+#	))
+
+build: $(goals) ;
+	$(CC) $(goals) -o ./bin/simulator $(LINK)
+
+#bin/%.o : src/%.cpp ;
+	
+
+.PHONY: clean
+clean:
+	rm -rf ./bin/*
+
+.PHONY: run
+run: build ;
+	./bin/simulator
\ No newline at end of file
diff --git a/Makefile.bak b/Makefile.bak
deleted file mode 100644
index d373bdd..0000000
--- a/Makefile.bak
+++ /dev/null
@@ -1,40 +0,0 @@
-LINK = -lstdc++ -lSDL2 -lOpenGL -lGLEW -lGLU
-DBG = -Wall
-CC := clang $(DBG) -c
-
-all: build ;
-
-goals = bin/main.o bin/Cube.o bin/Color.o bin/Quad.o bin/Vertex.o
-
-define pro =
-$(CC) -c $^ -o $@
-endef
-
-#bin/main.o: src/main.cpp
-#	$(pro)
-#bin/Cube.o: src/Cube.cpp
-#	$(pro)
-#bin/Color.o: src/Color.cpp
-#	$(pro)
-#bin/Quad.o: src/Quad.cpp
-#	$(pro)
-#bin/Vertex.o: src/Vertex.cpp
-#	$(pro)
-targets = $(patsubst bin/%.o,src/%.cpp,$(goals))
-$(goals): $(targets) ;
-	$(foreach goal,$(goals),$( \
-		$(CC) $(patsubst bin/%.o, src/%.cpp, $(goal)) \
-		echo $(goal) \
-	))
-
-build: $(targets) ;
-	
-	#$(CC) $(goals) -o ./bin/simulator $(LINK)
-
-.PHONY: clean
-clean:
-	rm -rf ./bin/*
-
-.PHONY: run
-run: build ;
-	./bin/simulator
\ No newline at end of file