2 files changed, 14 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 8cec40d..aebbfc6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,19 @@
-FLAGS_LINUX = -lGL                 -lSDL2_image -lSDL2_mixer
-FLAGS_WIN32 = -lopengl32 -lmingw32 -lSDL2_Image
+LIBS_LINUX = -lGL -lSDL2_image -lSDL2_mixer
+LIBS_WIN32 = -lopengl32 -lmingw32 -lSDL2_Image
+
 FLAGS = -m32 -std=c++11 -Iinclude -Iinclude/freetype2 -lSDL2main -lSDL2 -lfreetype
 
-all:
-	@g++ src/*.cpp -o main $(FLAGS_LINUX) $(FLAGS)
+SRCS = $(wildcard src/*.cpp)
+
+OUT = $(SRCS:.cpp=.o)
+
+.cpp.o:
+	g++ -o $@ -c $^ $(LIBS_LINUX) $(FLAGS)
 
-win32:
-	@g++ -L lib/ src/*.cpp -o main.exe $(FLAGS_WIN32) $(FLAGS)
+all: $(OUT)
+	mv ./src/*.o ./out
+	g++ -o main main.cpp out/*.o $(LIBS_LINUX) $(FLAGS)
 
 clean:
-	rm main*
+	-rm main
+	-rm out/*.o
diff --git a/src/main.cpp b/main.cpp
index fdb7d32..fdb7d32 100644
--- a/src/main.cpp
+++ b/main.cpp