Index: game.cpp
===================================================================
--- game.cpp	(revision 55401323166cd0284a5f464e0d7aa1762f7b5107)
+++ game.cpp	(revision 15c7ed91cac500b2da874214ebef62a2b7ded92f)
@@ -8,6 +8,8 @@
 #include <GLFW/glfw3.h>
 
-#ifdef __APPLE__
-   #define OSX
+#if defined(__linux__)
+   #define LINUX
+#elif defined(__APPLE__)
+   #define MAC
 #endif
 
@@ -32,5 +34,5 @@
 
    // required in OSX
-   #ifdef OSX
+   #ifdef MAC
       glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE);
    #endif
Index: makefile
===================================================================
--- makefile	(revision 55401323166cd0284a5f464e0d7aa1762f7b5107)
+++ makefile	(revision 15c7ed91cac500b2da874214ebef62a2b7ded92f)
@@ -1,16 +1,15 @@
 OS = $(shell uname)
+CC = g++
+CFLAGS = -std=c++0x -Wall -pedantic #-Wextra
 
 ifeq ($(OS),Darwin)
-	CHECK = OSX
-	CC = g++ game.cpp -framework Cocoa -framework OpenGL -framework IOKit -framework CoreVideo -lglfw3 -lglew -Wall -o game
+	DEP = -framework Cocoa -framework OpenGL -framework IOKit -framework CoreVideo -lglfw3 -lglew
 endif
-ifeq ($(OS),Lolbol)
-	CHECK = LINUX
-	CC = g++ game.cpp -lglfw3 -lGLEW -lGL -ldl -lX11 -lXrandr -lXxf86vm -lXinerama -lXcursor  -pthread -Wall -std=c++0x -o game
+ifeq ($(OS),Linux)
+	DEP = -lglfw3 -lGLEW -lGL -ldl -lX11 -lXrandr -lXxf86vm -lXinerama -lXcursor  -pthread
 endif
 
 game: game.cpp
-	@echo $(CHECK)
-	$(CC)
+	$(CC) $? $(DEP) $(CFLAGS) -o $@
 
 clean: