diff --git a/Makefile b/Makefile
index ba95501..558d789 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,15 @@
 executable = coffee_crisis
 
 windows:
-	mkdir bin
-	g++ -std=c++11 -Wall -O2 source/*.cpp -lmingw32 -lSDL2main -lSDL2 -o bin/coffee_crisis.exe
+	@echo off
+	if not exist bin\ (mkdir bin)
+	g++ -std=c++11 -Wall -O2 source/*.cpp -lmingw32 -lSDL2main -lSDL2 -o bin/$(executable).exe
 macos:
 	mkdir -p bin
-	g++ -std=c++11 -Wall -O2 source/*.cpp -o bin/$(executable)_macos -lSDL2
+	g++ -std=c++11 -Wall -O2 -lSDL2 source/*.cpp -o bin/$(executable)_macos
 linux:
 	mkdir -p bin
-	g++ source/*.cpp -std=c++11 -Os -lSDL2 -ffunction-sections -fdata-sections -Wl,--gc-sections -o bin/$(executable)_linux
+	g++ source/*.cpp -std=c++11 -Wall -Os -lSDL2 -ffunction-sections -fdata-sections -Wl,--gc-sections -o bin/$(executable)_linux
 	strip -s -R .comment -R .gnu.version bin/$(executable)_linux --strip-unneeded
 opendingux:
 	mkdir -p bin