diff --git a/examples/makefile b/examples/makefile
index 9763b233..500ba715 100644
--- a/examples/makefile
+++ b/examples/makefile
@@ -26,18 +26,21 @@
 # WARNING: To compile examples to HTML5, they must be redesigned to use emscripten.h and emscripten_set_main_loop()
 PLATFORM ?= PLATFORM_DESKTOP
 
-# determine SUBPLATFORM in case PLATFORM_DESKTOP selected
+# determine PLATFORM_OS in case PLATFORM_DESKTOP selected
 ifeq ($(PLATFORM),PLATFORM_DESKTOP)
     # No uname.exe on MinGW!, but OS=Windows_NT on Windows! ifeq ($(UNAME),Msys) -> Windows
     ifeq ($(OS),Windows_NT)
-        SUBPLATFORM=WINDOWS
+        PLATFORM_OS=WINDOWS
+        LIBPATH=win32
     else
         UNAMEOS:=$(shell uname)
         ifeq ($(UNAMEOS),Linux)
-            SUBPLATFORM=LINUX
+            PLATFORM_OS=LINUX
+            LIBPATH=linux
         else
         ifeq ($(UNAMEOS),Darwin)
-            SUBPLATFORM=OSX
+            PLATFORM_OS=OSX
+            LIBPATH=osx
         endif
         endif
     endif
@@ -47,10 +50,15 @@ endif
 ifeq ($(PLATFORM),PLATFORM_WEB)
     # define emscripten compiler
     CC = emcc
+else
+ifeq ($(PLATFORM_OS),OSX)
+    # define llvm compiler for mac
+    CC = clang
 else
     # define default gcc compiler
     CC = gcc
 endif
+endif
 
 # define compiler flags:
 #  -O2         defines optimization level
@@ -74,25 +82,39 @@ ifeq ($(PLATFORM),PLATFORM_RPI)
     INCLUDES = -I. -I../src -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads
 else
     INCLUDES = -I. -I../src
+# external libraries headers
+# GLFW3
+    INCLUDES += -I../external/glfw3/include
+# GLEW
+    INCLUDES += -I../external/glew/include
+# OpenAL Soft
+    INCLUDES += -I../external/openal_soft/include
 endif
 
 # define library paths containing required libs
 ifeq ($(PLATFORM),PLATFORM_RPI)
     LFLAGS = -L. -L../src -L/opt/vc/lib
 else
-    LFLAGS = -L. -L../src -L../external/glfw3/lib/ -I../external/openal_soft/lib/
+    LFLAGS = -L. -L../src
+# external libraries to link with
+# GLFW3
+    LFLAGS += -L../external/glfw3/lib/$(LIBPATH)
+# GLEW
+    LFLAGS += -L../external/openal_soft/lib/$(LIBPATH)
+# OpenAL Soft
+    LFLAGS += -L../external/glew/lib/$(LIBPATH)
 endif
 
 # define any libraries to link into executable
 # if you want to link libraries (libname.so or libname.a), use the -lname
 ifeq ($(PLATFORM),PLATFORM_DESKTOP)
-    ifeq ($(SUBPLATFORM),LINUX)
+    ifeq ($(PLATFORM_OS),LINUX)
         # libraries for Debian GNU/Linux desktop compiling
         # requires the following packages:
         # libglfw3-dev libopenal-dev libglew-dev libegl1-mesa-dev
         LIBS = -lraylib -lglfw -lGLEW -lGL -lopenal
     endif
-    ifeq ($(SUBPLATFORM),OSX)
+    ifeq ($(PLATFORM_OS),OSX)
     	# libraries for OS X 10.9 desktop compiling
 	# requires the following packages:
 	# libglfw3-dev libopenal-dev libglew-dev libegl1-mesa-dev
@@ -101,7 +123,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
     else
         # libraries for Windows desktop compiling
         # NOTE: GLFW3 and OpenAL Soft libraries should be installed
-        LIBS = -lraylib -lglfw3 -lglew32 -lopengl32 -lopenal32 -lgdi32    
+        LIBS = -lraylib -lglfw3 -lglew32 -lopengl32 -lopenal32 -lgdi32
     endif
 endif
 ifeq ($(PLATFORM),PLATFORM_RPI)
@@ -114,7 +136,7 @@ ifeq ($(PLATFORM),PLATFORM_WEB)
 endif
 
 # define additional parameters and flags for windows
-ifeq ($(PLATFORM),PLATFORM_DESKTOP)
+ifeq ($(PLATFORM_OS),WINDOWS)
     # resources file contains windows exe icon
     # -Wl,--subsystem,windows hides the console window
     WINFLAGS = ../src/resources -Wl,--subsystem,windows
@@ -290,10 +312,11 @@ audio_music_stream: audio_music_stream.c
 # clean everything
 clean:
 ifeq ($(PLATFORM),PLATFORM_DESKTOP)
-    ifeq ($(SUBPLATFORM),OSX)
+    ifeq ($(PLATFORM_OS),OSX)
+        find . -type f -perm +ugo+x -delete
 		rm -f *.o
     else
-    ifeq ($(SUBPLATFORM),LINUX)
+    ifeq ($(PLATFORM_OS),LINUX)
 		find . -type f -executable -delete
 		rm -f *.o
     else
diff --git a/external/glew/lib/libglew32.a b/external/glew/lib/win32/libglew32.a
similarity index 100%
rename from external/glew/lib/libglew32.a
rename to external/glew/lib/win32/libglew32.a
diff --git a/external/glew/lib/libglew32dll.a b/external/glew/lib/win32/libglew32dll.a
similarity index 100%
rename from external/glew/lib/libglew32dll.a
rename to external/glew/lib/win32/libglew32dll.a
diff --git a/external/glfw3/lib/libglfw.3.dylib b/external/glfw3/lib/libglfw.3.dylib
deleted file mode 120000
index cd20112e..00000000
--- a/external/glfw3/lib/libglfw.3.dylib
+++ /dev/null
@@ -1 +0,0 @@
-libglfw.3.0.dylib
\ No newline at end of file
diff --git a/external/glfw3/lib/libglfw.dylib b/external/glfw3/lib/libglfw.dylib
deleted file mode 120000
index d4bd51e1..00000000
--- a/external/glfw3/lib/libglfw.dylib
+++ /dev/null
@@ -1 +0,0 @@
-libglfw.3.dylib
\ No newline at end of file
diff --git a/external/glfw3/lib/libglfw.3.0.dylib b/external/glfw3/lib/osx/libglfw.3.0.dylib
old mode 100755
new mode 100644
similarity index 100%
rename from external/glfw3/lib/libglfw.3.0.dylib
rename to external/glfw3/lib/osx/libglfw.3.0.dylib
diff --git a/external/glfw3/lib/osx/libglfw.3.dylib b/external/glfw3/lib/osx/libglfw.3.dylib
new file mode 100644
index 00000000..cd20112e
--- /dev/null
+++ b/external/glfw3/lib/osx/libglfw.3.dylib
@@ -0,0 +1 @@
+libglfw.3.0.dylib
\ No newline at end of file
diff --git a/external/glfw3/lib/osx/libglfw.dylib b/external/glfw3/lib/osx/libglfw.dylib
new file mode 100644
index 00000000..d4bd51e1
--- /dev/null
+++ b/external/glfw3/lib/osx/libglfw.dylib
@@ -0,0 +1 @@
+libglfw.3.dylib
\ No newline at end of file
diff --git a/external/glfw3/lib/libglfw3.a b/external/glfw3/lib/win32/libglfw3.a
similarity index 100%
rename from external/glfw3/lib/libglfw3.a
rename to external/glfw3/lib/win32/libglfw3.a
diff --git a/external/glfw3/lib/libglfw3dll.a b/external/glfw3/lib/win32/libglfw3dll.a
similarity index 100%
rename from external/glfw3/lib/libglfw3dll.a
rename to external/glfw3/lib/win32/libglfw3dll.a
diff --git a/external/openal_soft/lib/libopenal32.a b/external/openal_soft/lib/win32/libopenal32.a
similarity index 100%
rename from external/openal_soft/lib/libopenal32.a
rename to external/openal_soft/lib/win32/libopenal32.a
diff --git a/src/makefile b/src/makefile
index 8566abe4..a726b92e 100644
--- a/src/makefile
+++ b/src/makefile
@@ -25,18 +25,18 @@
 # possible platforms: PLATFORM_DESKTOP PLATFORM_RPI PLATFORM_WEB
 PLATFORM ?= PLATFORM_DESKTOP
 
-# determine SUBPLATFORM in case PLATFORM_DESKTOP selected
+# determine PLATFORM_OS in case PLATFORM_DESKTOP selected
 ifeq ($(PLATFORM),PLATFORM_DESKTOP)
     # No uname.exe on MinGW!, but OS=Windows_NT on Windows! ifeq ($(UNAME),Msys) -> Windows
     ifeq ($(OS),Windows_NT)
-        SUBPLATFORM=WINDOWS
+        PLATFORM_OS=WINDOWS
     else
         UNAMEOS:=$(shell uname)
         ifeq ($(UNAMEOS),Linux)
-            SUBPLATFORM=LINUX
+            PLATFORM_OS=LINUX
         else
         ifeq ($(UNAMEOS),Darwin)
-            SUBPLATFORM=OSX
+            PLATFORM_OS=OSX
         endif
         endif
     endif
@@ -82,7 +82,14 @@ endif
 ifeq ($(PLATFORM),PLATFORM_RPI)
     INCLUDES = -I. -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads
 else
-    INCLUDES = -I. -I../external/glfw3/include/ -I../external/openal_soft/include/
+    INCLUDES = -I. -I../src
+# external libraries headers
+# GLFW3
+    INCLUDES += -I../external/glfw3/include
+# GLEW
+    INCLUDES += -I../external/glew/include
+# OpenAL Soft
+    INCLUDES += -I../external/openal_soft/include
 endif
 
 # define all object files required
@@ -144,10 +151,10 @@ stb_vorbis.o: stb_vorbis.c
 # clean everything
 clean:
 ifeq ($(PLATFORM),PLATFORM_DESKTOP)
-    ifeq ($(SUBPLATFORM),OSX)
+    ifeq ($(PLATFORM_OS),OSX)
 		rm -f *.o libraylib.a
     else
-    ifeq ($(SUBPLATFORM),LINUX)
+    ifeq ($(PLATFORM_OS),LINUX)
 		find . -type f -executable -delete
 		rm -f *.o libraylib.a
     else