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

diff --cc src/Makefile
index f40ab90a71f66e964e39fda497f82619ee95bcce,972edcbd8b5ad1c73c66b2b538a8f2e76131a5ad..d7fea6710c8dd42dcf18002ac61cf48e9512cb0b
--- 1/src/Makefile
--- 2/src/Makefile
+++ b/src/Makefile
@@@ -1,9 -1,8 +1,9 @@@
  LIBS = -lGL -lSDL2 -lSDL2_image -lSDL2_mixer -lfreetype
  
- FLAGS = -std=c++11 -I../include -I../include/freetype2
+ FLAGS = -m32 -std=c++11 -I../include -I../include/freetype2
  
  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/')