From: drumsetmonkey <abelleisle@roadrunner.com>
Date: Fri, 13 Nov 2015 17:53:47 +0000 (-0500)
Subject: Merge branch 'master' of http://github.com/tcsullivan/gamedev
X-Git-Url: https://code.bitgloo.com/?a=commitdiff_plain;h=23cccb0435bad7330eeaf3d8aee39b3023ac26c8;p=clyne%2Fgamedev.git

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

23cccb0435bad7330eeaf3d8aee39b3023ac26c8
diff --cc src/Makefile
index f40ab90,972edcb..d7fea67
--- a/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/')