Merge remote-tracking branch 'refs/remotes/raysan5/develop' into develop

7 files changed, 65 insertions, 166 deletions

diff --git a/templates/advance_game/Makefile b/templates/advance_game/Makefile
index d790fe26..b3947205 100644
--- a/templates/advance_game/Makefile
+++ b/templates/advance_game/Makefile
@@ -23,6 +23,8 @@
 #
 #**************************************************************************************************
 
+.PHONY: all clean
+
 # define raylib platform to compile for
 # possible platforms: PLATFORM_DESKTOP PLATFORM_RPI PLATFORM_WEB
 # WARNING: To compile to HTML5, code must be redesigned to use emscripten.h and emscripten_set_main_loop()
@@ -93,8 +95,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
@@ -109,37 +109,16 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
     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: 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
+        ifeq ($(PLATFORM_OS),WINDOWS)
+            LFLAGS += -LC:/raylib/raylib/src
+        endif
         # external libraries to link with
         # GLFW3
-        LFLAGS += -L../../external/glfw3/lib/$(LIBPATH)
+            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,15 +129,15 @@ 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
-        LIBS = -lraylib -lglfw -framework OpenGL -framework OpenAl -framework Cocoa
+        # libglfw3-dev libopenal-dev libegl1-mesa-dev
+        LIBS = -lraylib -lglfw3 -framework OpenGL -framework OpenAl -framework Cocoa
     else
         # libraries for Windows desktop compiling
         # NOTE: GLFW3 and OpenAL Soft libraries should be installed
@@ -228,21 +207,22 @@ clean:
 ifeq ($(PLATFORM),PLATFORM_DESKTOP)
     ifeq ($(PLATFORM_OS),OSX)
 		find . -type f -perm +ugo+x -delete
-		rm -f *.o
+		rm -f screens/*.o
     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
+		find . -type f -executable -delete
+		rm -f screens/*.o
     else
-		del *.o *.exe
+		del screens\*.o *.exe
     endif
     endif
 endif
 ifeq ($(PLATFORM),PLATFORM_RPI)
 	find . -type f -executable -delete
-	rm -f *.o
+	rm -f screens/*.o
 endif
 ifeq ($(PLATFORM),PLATFORM_WEB)
-	del *.o *.html *.js
+	del screens/*.o *.html *.js
 endif
 	@echo Cleaning done
 
diff --git a/templates/android_project/AndroidManifest.xml b/templates/android_project/AndroidManifest.xml
index f9f41b33..6755027e 100644
--- a/templates/android_project/AndroidManifest.xml
+++ b/templates/android_project/AndroidManifest.xml
@@ -29,8 +29,7 @@
                 <!-- android:theme="@android:style/Theme.NoTitleBar.Fullscreen" -->
                 <!-- android:screenOrientation="portrait" -->
             <!-- Tell NativeActivity the name of our .so -->
-            <!--<meta-data android:name="android.app.lib_name" android:value="raylib_game" /> -->
-            <meta-data android:name="android.app.lib_name" android:value="@string/app_name" />
+            <meta-data android:name="android.app.lib_name" android:value="raylib_game" />
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/templates/android_project/jni/Android.mk b/templates/android_project/jni/Android.mk
index 424db553..fe4ba813 100644
--- a/templates/android_project/jni/Android.mk
+++ b/templates/android_project/jni/Android.mk
@@ -73,7 +73,7 @@ include $(PREBUILT_STATIC_LIBRARY)
 include $(CLEAR_VARS)
 
 # Module name
-LOCAL_MODULE     := raylibGame
+LOCAL_MODULE     := raylib_game
 
 # Module source files
 LOCAL_SRC_FILES  := basic_game.c
@@ -95,7 +95,7 @@ LOCAL_STATIC_LIBRARIES := android_native_app_glue raylib openal
 # NOTE: It brokes the build, using static library instead
 #LOCAL_SHARED_LIBRARIES := openal
 
-# Build the shared library libraylibGame.so
+# Build the shared library libraylib_game.so
 include $(BUILD_SHARED_LIBRARY)
 
 $(call import-module,android/native_app_glue)
diff --git a/templates/basic_game/Makefile b/templates/basic_game/Makefile
index 428c980a..76337490 100644
--- a/templates/basic_game/Makefile
+++ b/templates/basic_game/Makefile
@@ -23,6 +23,8 @@
 #
 #**************************************************************************************************
 
+.PHONY: all clean
+
 # define raylib platform to compile for
 # possible platforms: PLATFORM_DESKTOP PLATFORM_RPI PLATFORM_WEB
 # WARNING: To compile to HTML5, code must be redesigned to use emscripten.h and emscripten_set_main_loop()
@@ -93,8 +95,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
@@ -109,37 +109,16 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
     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: 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
+        ifeq ($(PLATFORM_OS),WINDOWS)
+            LFLAGS += -LC:/raylib/raylib/src
+        endif
         # external libraries to link with
         # GLFW3
-        LFLAGS += -L../../external/glfw3/lib/$(LIBPATH)
+            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 +129,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
@@ -203,7 +182,8 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
 		rm -f *.o
     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
+		find . -type f -executable -delete
+		rm -f *.o
     else
 		del *.o *.exe
     endif
diff --git a/templates/basic_test/Makefile b/templates/basic_test/Makefile
index 835484f6..b6fd44a7 100644
--- a/templates/basic_test/Makefile
+++ b/templates/basic_test/Makefile
@@ -23,6 +23,8 @@
 #
 #**************************************************************************************************
 
+.PHONY: all clean
+
 # define raylib platform to compile for
 # possible platforms: PLATFORM_DESKTOP PLATFORM_RPI PLATFORM_WEB
 # WARNING: To compile to HTML5, code must be redesigned to use emscripten.h and emscripten_set_main_loop()
@@ -92,8 +94,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
@@ -108,37 +108,16 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
     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: 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
+        ifeq ($(PLATFORM_OS),WINDOWS)
+            LFLAGS += -LC:/raylib/raylib/src
+        endif
         # external libraries to link with
         # GLFW3
-        LFLAGS += -L../../external/glfw3/lib/$(LIBPATH)
+            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,15 +128,15 @@ 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
-        LIBS = -lraylib -lglfw -framework OpenGL -framework OpenAl -framework Cocoa
+        # libglfw3-dev libopenal-dev libegl1-mesa-dev
+        LIBS = -lraylib -lglfw3 -framework OpenGL -framework OpenAl -framework Cocoa
     else
         # libraries for Windows desktop compiling
         # NOTE: GLFW3 and OpenAL Soft libraries should be installed
@@ -202,7 +181,8 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
 		rm -f *.o
     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
+		find . -type f -executable -delete
+		rm -f *.o
     else
 		del *.o *.exe
     endif
diff --git a/templates/simple_game/Makefile b/templates/simple_game/Makefile
index 707f858d..3d303082 100644
--- a/templates/simple_game/Makefile
+++ b/templates/simple_game/Makefile
@@ -23,6 +23,8 @@
 #
 #**************************************************************************************************
 
+.PHONY: all clean
+
 # define raylib platform to compile for
 # possible platforms: PLATFORM_DESKTOP PLATFORM_RPI PLATFORM_WEB
 # WARNING: To compile to HTML5, code must be redesigned to use emscripten.h and emscripten_set_main_loop()
@@ -93,8 +95,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
@@ -109,37 +109,16 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
     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: 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
+        ifeq ($(PLATFORM_OS),WINDOWS)
+            LFLAGS += -LC:/raylib/raylib/src
+        endif
         # external libraries to link with
         # GLFW3
-        LFLAGS += -L../../external/glfw3/lib/$(LIBPATH)
+            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,15 +129,15 @@ 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
-        LIBS = -lraylib -lglfw -framework OpenGL -framework OpenAl -framework Cocoa
+        # libglfw3-dev libopenal-dev libegl1-mesa-dev
+        LIBS = -lraylib -lglfw3 -framework OpenGL -framework OpenAl -framework Cocoa
     else
         # libraries for Windows desktop compiling
         # NOTE: GLFW3 and OpenAL Soft libraries should be installed
@@ -207,7 +186,8 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
 		rm -f *.o
     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
+		find . -type f -executable -delete
+		rm -f screens/*.o
     else
 		del *.o *.exe
     endif
diff --git a/templates/standard_game/Makefile b/templates/standard_game/Makefile
index 6c67be42..c7cb7add 100644
--- a/templates/standard_game/Makefile
+++ b/templates/standard_game/Makefile
@@ -23,6 +23,8 @@
 #
 #**************************************************************************************************
 
+.PHONY: all clean
+
 # define raylib platform to compile for
 # possible platforms: PLATFORM_DESKTOP PLATFORM_RPI PLATFORM_WEB
 # WARNING: To compile to HTML5, code must be redesigned to use emscripten.h and emscripten_set_main_loop()
@@ -93,8 +95,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
@@ -109,37 +109,16 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
     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: 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
+        ifeq ($(PLATFORM_OS),WINDOWS)
+            LFLAGS += -LC:/raylib/raylib/src
+        endif
         # external libraries to link with
         # GLFW3
-        LFLAGS += -L../../external/glfw3/lib/$(LIBPATH)
+            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,15 +129,15 @@ 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
-        LIBS = -lraylib -lglfw -framework OpenGL -framework OpenAl -framework Cocoa
+        # libglfw3-dev libopenal-dev libegl1-mesa-dev
+        LIBS = -lraylib -lglfw3 -framework OpenGL -framework OpenAl -framework Cocoa
     else
         # libraries for Windows desktop compiling
         # NOTE: GLFW3 and OpenAL Soft libraries should be installed
@@ -228,21 +207,22 @@ clean:
 ifeq ($(PLATFORM),PLATFORM_DESKTOP)
     ifeq ($(PLATFORM_OS),OSX)
 		find . -type f -perm +ugo+x -delete
-		rm -f *.o
+		rm -f screens/*.o
     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
+		find . -type f -executable -delete
+		rm -f screens/*.o
     else
-		del *.o *.exe
+		del screens\*.o *.exe
     endif
     endif
 endif
 ifeq ($(PLATFORM),PLATFORM_RPI)
 	find . -type f -executable -delete
-	rm -f *.o
+	rm -f screens/*.o
 endif
 ifeq ($(PLATFORM),PLATFORM_WEB)
-	del *.o *.html *.js
+	del screens/*.o *.html *.js
 endif
 	@echo Cleaning done