Merge pull request #107 from LelixSuper/develop

Cleaning of Makefile files

7 files changed, 14 insertions, 172 deletions

diff --git a/examples/Makefile b/examples/Makefile
index e62488ae..74335fe8 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -90,8 +90,6 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
         # external libraries headers
         # GLFW3
             INCLUDES += -I../../external/glfw3/include
-        # GLEW - Not required any more, replaced by GLAD
-            #INCLUDES += -I../external/glew/include
         # OpenAL Soft
             INCLUDES += -I../../external/openal_soft/include
     endif
@@ -113,30 +111,6 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
         ifneq ($(PLATFORM_OS),OSX)
         # OpenAL Soft
             LFLAGS += -L../../external/openal_soft/lib/$(LIBPATH)
-        # GLEW: Not used, replaced by GLAD
-            #LFLAGS += -L../../external/glew/lib/$(LIBPATH)
-        endif
-    endif
-endif
-
-# define library paths containing required libs
-ifeq ($(PLATFORM),PLATFORM_RPI)
-    LFLAGS = -L. -L../../src -L/opt/vc/lib
-endif
-ifeq ($(PLATFORM),PLATFORM_DESKTOP)
-    # add standard directories for GNU/Linux
-    ifeq ($(PLATFORM_OS),LINUX)
-        LFLAGS = -L. -L../../src
-    else
-        LFLAGS = -L. -L../../src -LC:/raylib/raylib/src
-        # external libraries to link with
-        # GLFW3
-        LFLAGS += -L../../external/glfw3/lib/$(LIBPATH)
-        ifneq ($(PLATFORM_OS),OSX)
-        # OpenAL Soft
-            LFLAGS += -L../../external/openal_soft/lib/$(LIBPATH)
-        # GLEW
-            LFLAGS += -L../../external/glew/lib/$(LIBPATH)
         endif
     endif
 endif
@@ -147,14 +121,14 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
     ifeq ($(PLATFORM_OS),LINUX)
         # libraries for Debian GNU/Linux desktop compiling
         # requires the following packages:
-        # libglfw3-dev libopenal-dev libglew-dev libegl1-mesa-dev
+        # libglfw3-dev libopenal-dev libegl1-mesa-dev
         LIBS = -lraylib -lglfw3 -lGL -lopenal -lm -pthread -ldl -lX11 \
                -lXrandr -lXinerama -lXi -lXxf86vm -lXcursor
     else
     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
+        # libglfw3-dev libopenal-dev libegl1-mesa-dev
         LIBS = -lraylib -lglfw -framework OpenGL -framework OpenAl -framework Cocoa
     else
         # libraries for Windows desktop compiling
diff --git a/src/Makefile b/src/Makefile
index cab2ced0..76dbfc67 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -84,8 +84,6 @@ else
 # external libraries headers
 # GLFW3
     INCLUDES += -I../external/glfw3/include
-# GLEW
-    INCLUDES += -I../external/glew/include
 # OpenAL Soft
     INCLUDES += -I../external/openal_soft/include
 endif
@@ -143,7 +141,7 @@ models.o: models.c
 # compile audio module
 audio.o: audio.c
 	$(CC) -c audio.c $(CFLAGS) $(INCLUDES) -D$(PLATFORM)
-	
+
 # compile stb_vorbis library
 stb_vorbis.o: stb_vorbis.c
 	$(CC) -c stb_vorbis.c -O1 $(INCLUDES) -D$(PLATFORM)
@@ -167,7 +165,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
 		rm -f *.o libraylib.a
     else
     ifeq ($(PLATFORM_OS),LINUX)
-		find -type f -executable | xargs file -i | grep -E 'x-object|x-archive|x-sharedlib|x-executable' | rev | cut -d ':' -f 2- | rev | xargs rm -f
+		rm -f *.o libraylib.a
     else
 		del *.o libraylib.a
     endif
diff --git a/templates/advance_game/Makefile b/templates/advance_game/Makefile
index d790fe26..17b16c1a 100644
--- a/templates/advance_game/Makefile
+++ b/templates/advance_game/Makefile
@@ -93,8 +93,6 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
         # external libraries headers
         # GLFW3
             INCLUDES += -I../../external/glfw3/include
-        # GLEW - Not required any more, replaced by GLAD
-            #INCLUDES += -I../external/glew/include
         # OpenAL Soft
             INCLUDES += -I../../external/openal_soft/include
     endif
@@ -116,30 +114,6 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
         ifneq ($(PLATFORM_OS),OSX)
         # OpenAL Soft
             LFLAGS += -L../../external/openal_soft/lib/$(LIBPATH)
-        # GLEW: Not used, replaced by GLAD
-            #LFLAGS += -L../../external/glew/lib/$(LIBPATH)
-        endif
-    endif
-endif
-
-# define library paths containing required libs
-ifeq ($(PLATFORM),PLATFORM_RPI)
-    LFLAGS = -L. -L../../src -L/opt/vc/lib
-endif
-ifeq ($(PLATFORM),PLATFORM_DESKTOP)
-    # add standard directories for GNU/Linux
-    ifeq ($(PLATFORM_OS),LINUX)
-        LFLAGS = -L. -L../../src
-    else
-        LFLAGS = -L. -L../../src -LC:/raylib/raylib/src
-        # external libraries to link with
-        # GLFW3
-        LFLAGS += -L../../external/glfw3/lib/$(LIBPATH)
-        ifneq ($(PLATFORM_OS),OSX)
-        # OpenAL Soft
-            LFLAGS += -L../../external/openal_soft/lib/$(LIBPATH)
-        # GLEW
-            LFLAGS += -L../../external/glew/lib/$(LIBPATH)
         endif
     endif
 endif
@@ -150,14 +124,14 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
     ifeq ($(PLATFORM_OS),LINUX)
         # libraries for Debian GNU/Linux desktop compiling
         # requires the following packages:
-        # libglfw3-dev libopenal-dev libglew-dev libegl1-mesa-dev
+        # libglfw3-dev libopenal-dev libegl1-mesa-dev
         LIBS = -lraylib -lglfw3 -lGL -lopenal -lm -pthread -ldl -lX11 \
                -lXrandr -lXinerama -lXi -lXxf86vm -lXcursor
     else
     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
+        # libglfw3-dev libopenal-dev libegl1-mesa-dev
         LIBS = -lraylib -lglfw -framework OpenGL -framework OpenAl -framework Cocoa
     else
         # libraries for Windows desktop compiling
diff --git a/templates/basic_game/Makefile b/templates/basic_game/Makefile
index 428c980a..f512a180 100644
--- a/templates/basic_game/Makefile
+++ b/templates/basic_game/Makefile
@@ -93,8 +93,6 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
         # external libraries headers
         # GLFW3
             INCLUDES += -I../../external/glfw3/include
-        # GLEW - Not required any more, replaced by GLAD
-            #INCLUDES += -I../external/glew/include
         # OpenAL Soft
             INCLUDES += -I../../external/openal_soft/include
     endif
@@ -116,30 +114,6 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
         ifneq ($(PLATFORM_OS),OSX)
         # OpenAL Soft
             LFLAGS += -L../../external/openal_soft/lib/$(LIBPATH)
-        # GLEW: Not used, replaced by GLAD
-            #LFLAGS += -L../../external/glew/lib/$(LIBPATH)
-        endif
-    endif
-endif
-
-# define library paths containing required libs
-ifeq ($(PLATFORM),PLATFORM_RPI)
-    LFLAGS = -L. -L../../src -L/opt/vc/lib
-endif
-ifeq ($(PLATFORM),PLATFORM_DESKTOP)
-    # add standard directories for GNU/Linux
-    ifeq ($(PLATFORM_OS),LINUX)
-        LFLAGS = -L. -L../../src
-    else
-        LFLAGS = -L. -L../../src -LC:/raylib/raylib/src
-        # external libraries to link with
-        # GLFW3
-        LFLAGS += -L../../external/glfw3/lib/$(LIBPATH)
-        ifneq ($(PLATFORM_OS),OSX)
-        # OpenAL Soft
-            LFLAGS += -L../../external/openal_soft/lib/$(LIBPATH)
-        # GLEW
-            LFLAGS += -L../../external/glew/lib/$(LIBPATH)
         endif
     endif
 endif
@@ -150,14 +124,14 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
     ifeq ($(PLATFORM_OS),LINUX)
         # libraries for Debian GNU/Linux desktop compiling
         # requires the following packages:
-        # libglfw3-dev libopenal-dev libglew-dev libegl1-mesa-dev
+        # libglfw3-dev libopenal-dev libegl1-mesa-dev
         LIBS = -lraylib -lglfw3 -lGL -lopenal -lm -pthread -ldl -lX11 \
                -lXrandr -lXinerama -lXi -lXxf86vm -lXcursor
     else
     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
+        # libglfw3-dev libopenal-dev libegl1-mesa-dev
         LIBS = -lraylib -lglfw -framework OpenGL -framework OpenAl -framework Cocoa
     else
         # libraries for Windows desktop compiling
diff --git a/templates/basic_test/Makefile b/templates/basic_test/Makefile
index 835484f6..95b8cd15 100644
--- a/templates/basic_test/Makefile
+++ b/templates/basic_test/Makefile
@@ -92,8 +92,6 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
         # external libraries headers
         # GLFW3
             INCLUDES += -I../../external/glfw3/include
-        # GLEW - Not required any more, replaced by GLAD
-            #INCLUDES += -I../external/glew/include
         # OpenAL Soft
             INCLUDES += -I../../external/openal_soft/include
     endif
@@ -115,30 +113,6 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
         ifneq ($(PLATFORM_OS),OSX)
         # OpenAL Soft
             LFLAGS += -L../../external/openal_soft/lib/$(LIBPATH)
-        # GLEW: Not used, replaced by GLAD
-            #LFLAGS += -L../../external/glew/lib/$(LIBPATH)
-        endif
-    endif
-endif
-
-# define library paths containing required libs
-ifeq ($(PLATFORM),PLATFORM_RPI)
-    LFLAGS = -L. -L../../src -L/opt/vc/lib
-endif
-ifeq ($(PLATFORM),PLATFORM_DESKTOP)
-    # add standard directories for GNU/Linux
-    ifeq ($(PLATFORM_OS),LINUX)
-        LFLAGS = -L. -L../../src
-    else
-        LFLAGS = -L. -L../../src -LC:/raylib/raylib/src
-        # external libraries to link with
-        # GLFW3
-        LFLAGS += -L../../external/glfw3/lib/$(LIBPATH)
-        ifneq ($(PLATFORM_OS),OSX)
-        # OpenAL Soft
-            LFLAGS += -L../../external/openal_soft/lib/$(LIBPATH)
-        # GLEW
-            LFLAGS += -L../../external/glew/lib/$(LIBPATH)
         endif
     endif
 endif
@@ -149,14 +123,14 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
     ifeq ($(PLATFORM_OS),LINUX)
         # libraries for Debian GNU/Linux desktop compiling
         # requires the following packages:
-        # libglfw3-dev libopenal-dev libglew-dev libegl1-mesa-dev
+        # libglfw3-dev libopenal-dev libegl1-mesa-dev
         LIBS = -lraylib -lglfw3 -lGL -lopenal -lm -pthread -ldl -lX11 \
                -lXrandr -lXinerama -lXi -lXxf86vm -lXcursor
     else
     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
+        # libglfw3-dev libopenal-dev libegl1-mesa-dev
         LIBS = -lraylib -lglfw -framework OpenGL -framework OpenAl -framework Cocoa
     else
         # libraries for Windows desktop compiling
diff --git a/templates/simple_game/Makefile b/templates/simple_game/Makefile
index 707f858d..de3401f7 100644
--- a/templates/simple_game/Makefile
+++ b/templates/simple_game/Makefile
@@ -93,8 +93,6 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
         # external libraries headers
         # GLFW3
             INCLUDES += -I../../external/glfw3/include
-        # GLEW - Not required any more, replaced by GLAD
-            #INCLUDES += -I../external/glew/include
         # OpenAL Soft
             INCLUDES += -I../../external/openal_soft/include
     endif
@@ -116,30 +114,6 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
         ifneq ($(PLATFORM_OS),OSX)
         # OpenAL Soft
             LFLAGS += -L../../external/openal_soft/lib/$(LIBPATH)
-        # GLEW: Not used, replaced by GLAD
-            #LFLAGS += -L../../external/glew/lib/$(LIBPATH)
-        endif
-    endif
-endif
-
-# define library paths containing required libs
-ifeq ($(PLATFORM),PLATFORM_RPI)
-    LFLAGS = -L. -L../../src -L/opt/vc/lib
-endif
-ifeq ($(PLATFORM),PLATFORM_DESKTOP)
-    # add standard directories for GNU/Linux
-    ifeq ($(PLATFORM_OS),LINUX)
-        LFLAGS = -L. -L../../src
-    else
-        LFLAGS = -L. -L../../src -LC:/raylib/raylib/src
-        # external libraries to link with
-        # GLFW3
-        LFLAGS += -L../../external/glfw3/lib/$(LIBPATH)
-        ifneq ($(PLATFORM_OS),OSX)
-        # OpenAL Soft
-            LFLAGS += -L../../external/openal_soft/lib/$(LIBPATH)
-        # GLEW
-            LFLAGS += -L../../external/glew/lib/$(LIBPATH)
         endif
     endif
 endif
@@ -150,14 +124,14 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
     ifeq ($(PLATFORM_OS),LINUX)
         # libraries for Debian GNU/Linux desktop compiling
         # requires the following packages:
-        # libglfw3-dev libopenal-dev libglew-dev libegl1-mesa-dev
+        # libglfw3-dev libopenal-dev libegl1-mesa-dev
         LIBS = -lraylib -lglfw3 -lGL -lopenal -lm -pthread -ldl -lX11 \
                -lXrandr -lXinerama -lXi -lXxf86vm -lXcursor
     else
     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
+        # libglfw3-dev libopenal-dev libegl1-mesa-dev
         LIBS = -lraylib -lglfw -framework OpenGL -framework OpenAl -framework Cocoa
     else
         # libraries for Windows desktop compiling
diff --git a/templates/standard_game/Makefile b/templates/standard_game/Makefile
index 6c67be42..c88c8211 100644
--- a/templates/standard_game/Makefile
+++ b/templates/standard_game/Makefile
@@ -93,8 +93,6 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
         # external libraries headers
         # GLFW3
             INCLUDES += -I../../external/glfw3/include
-        # GLEW - Not required any more, replaced by GLAD
-            #INCLUDES += -I../external/glew/include
         # OpenAL Soft
             INCLUDES += -I../../external/openal_soft/include
     endif
@@ -116,30 +114,6 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
         ifneq ($(PLATFORM_OS),OSX)
         # OpenAL Soft
             LFLAGS += -L../../external/openal_soft/lib/$(LIBPATH)
-        # GLEW: Not used, replaced by GLAD
-            #LFLAGS += -L../../external/glew/lib/$(LIBPATH)
-        endif
-    endif
-endif
-
-# define library paths containing required libs
-ifeq ($(PLATFORM),PLATFORM_RPI)
-    LFLAGS = -L. -L../../src -L/opt/vc/lib
-endif
-ifeq ($(PLATFORM),PLATFORM_DESKTOP)
-    # add standard directories for GNU/Linux
-    ifeq ($(PLATFORM_OS),LINUX)
-        LFLAGS = -L. -L../../src
-    else
-        LFLAGS = -L. -L../../src -LC:/raylib/raylib/src
-        # external libraries to link with
-        # GLFW3
-        LFLAGS += -L../../external/glfw3/lib/$(LIBPATH)
-        ifneq ($(PLATFORM_OS),OSX)
-        # OpenAL Soft
-            LFLAGS += -L../../external/openal_soft/lib/$(LIBPATH)
-        # GLEW
-            LFLAGS += -L../../external/glew/lib/$(LIBPATH)
         endif
     endif
 endif
@@ -150,14 +124,14 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
     ifeq ($(PLATFORM_OS),LINUX)
         # libraries for Debian GNU/Linux desktop compiling
         # requires the following packages:
-        # libglfw3-dev libopenal-dev libglew-dev libegl1-mesa-dev
+        # libglfw3-dev libopenal-dev libegl1-mesa-dev
         LIBS = -lraylib -lglfw3 -lGL -lopenal -lm -pthread -ldl -lX11 \
                -lXrandr -lXinerama -lXi -lXxf86vm -lXcursor
     else
     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
+        # libglfw3-dev libopenal-dev libegl1-mesa-dev
         LIBS = -lraylib -lglfw -framework OpenGL -framework OpenAl -framework Cocoa
     else
         # libraries for Windows desktop compiling