diff --git a/makefile b/makefile
index d296d33..7e5efca 100644
--- a/makefile
+++ b/makefile
@@ -17,6 +17,9 @@ all: $(OUTDIR) dll
 debug: export CXXFLAGS+=-g
 debug: clean all
 
+ifeq ($(OS),Windows_NT)
+release: export CXXFLAGS+=-static-libgcc -static-libstdc++
+endif
 release: clean all package
 
 #For use on my machine ONLY
diff --git a/todo.txt b/todo.txt
index 5fc5c6d..5d5b6db 100644
--- a/todo.txt
+++ b/todo.txt
@@ -22,4 +22,5 @@ TODO: Fix the const-ness of accessors
 TODO: Add a screenshot of the game to README.md
 TODO: joystick/gamepad support
 TODO: add the tilesheet to the map system
-TODO: Better collision logic
\ No newline at end of file
+TODO: Better collision logic
+TODO: cleaner shutdowns
\ No newline at end of file