Merge branch 'hotfix' into drunk

This commit is contained in:
2016-12-04 02:34:58 +11:00
2 changed files with 5 additions and 1 deletions
+3
View File
@@ -17,6 +17,9 @@ all: $(OUTDIR) dll
debug: export CXXFLAGS+=-g debug: export CXXFLAGS+=-g
debug: clean all debug: clean all
ifeq ($(OS),Windows_NT)
release: export CXXFLAGS+=-static-libgcc -static-libstdc++
endif
release: clean all package release: clean all package
#For use on my machine ONLY #For use on my machine ONLY
+1
View File
@@ -23,3 +23,4 @@ TODO: Add a screenshot of the game to README.md
TODO: joystick/gamepad support TODO: joystick/gamepad support
TODO: add the tilesheet to the map system TODO: add the tilesheet to the map system
TODO: Better collision logic TODO: Better collision logic
TODO: cleaner shutdowns