Merge branch 'master' of http://github.com/tcsullivan/gamedev

3 files changed, 6 insertions, 20 deletions

diff --git a/src/Makefile b/src/Makefile
deleted file mode 100644
index 91743ef..0000000
--- a/src/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-LIBS = -lpthread -lGL -lSDL2 -lSDL2_image -lSDL2_mixer -lfreetype
-
-FLAGS = -std=c++11 -I../include -I../include/freetype2 -Wall -Wextra -Werror
-
-OUT = `echo "" $$(ls -c $(wildcard *.cpp)) | sed s/.cpp/.o/g | sed 's/ / ..\/out\//g'`
-OUT64 = `echo "" $$(ls -c $(wildcard *.cpp)) | sed s/.cpp/.o/g | sed 's/ / ..\/out64\//g'`
-
-../out/%.o:
-	@echo "  CXX " $(shell echo $@ | sed 's/..\/out\///g' | sed 's/\.o/\.cpp/')
-	@g++ $(FLAGS) -m32 -o $@ -c $(shell echo $@ | sed 's/..\/out\///g' | sed 's/\.o/\.cpp/') $(LIBS) -lSDL2main
-
-../out64/%.o:
-	@echo "  CXX " $(shell echo $@ | sed 's/..\/out64\///g' | sed 's/\.o/\.cpp/')
-	@g++ $(FLAGS) -m64 -o $@ -c $(shell echo $@ | sed 's/..\/out64\///g' | sed 's/\.o/\.cpp/') $(LIBS)
-
-all: $(shell echo $(OUT))
-
-64: $(shell echo $(OUT64))
diff --git a/src/threadpool.cpp b/src/threadpool.cpp
index d49217d..619f002 100644
--- a/src/threadpool.cpp
+++ b/src/threadpool.cpp
@@ -1,5 +1,9 @@
 #include "threadpool.h"
 
+/**
+ * Stolen from some guy.
+ */
+
 // Constructor.
 ThreadPool::ThreadPool(int threads) :
 	terminate(false),
@@ -92,4 +96,4 @@ ThreadPool::~ThreadPool()
 	{
 		ShutDown();
 	}
-}
\ No newline at end of file
+}
diff --git a/src/ui.cpp b/src/ui.cpp
index 7aed916..2c9a230 100644
--- a/src/ui.cpp
+++ b/src/ui.cpp
@@ -12,7 +12,7 @@ extern SDL_Window *window;
 
 /*
  *	External references for updating player coords / current world.
-*/
+ */
 
 extern Player *player;
 extern World  *currentWorld;