Merge pull request #269 from raysan5/develop

Integrate develop branch

docs/common/js/games.js

@@ -14,13 +14,12 @@ $(document).ready(function() {
         'sample_space_invaders',
         'sample_floppy',
         'sample_tetris',
-        'sample_gold_fever',
-        'sample_doom',
         'game_drturtle',
         'game_just_do',
         'game_skully_escape',
         'game_koala_seasons',
         'game_light_my_ritual',
+        'game_wave_collector',
         'user_raymario',    
         'user_crazyball',
         'user_tictactoe',
@@ -39,13 +38,12 @@ $(document).ready(function() {
         'space invaders',
         'floppy',
         'tetris',
-        'gold fever',
-        'doom',
         'Dr Turtle & Mr Gamera',
         'JUST DO',
         'Skully Escape',
         'Koala Seasons',
         'LIGHT MY RITUAL',
+        'Wave Collector',
         'RayMario (Victor Fisac)',    
         'CrazyBall (Victor Fisac)',
         'Tic-Tac-Toe (LelixSuper)',

docs/examples/src/text/text_ttf_loading.c

@@ -25,7 +25,7 @@ int main()
     // NOTE: Textures/Fonts MUST be loaded after Window initialization (OpenGL context is required)
     
     // TTF SpriteFont loading with custom generation parameters
-    SpriteFont font = LoadSpriteFontTTF("resources/KAISG.ttf", 96, 0, 0);
+    SpriteFont font = LoadSpriteFontEx("resources/KAISG.ttf", 96, 0, 0);
     
     // Generate mipmap levels to use trilinear filtering
     // NOTE: On 2D drawing it won't be noticeable, it looks like FILTER_BILINEAR
@@ -82,7 +82,7 @@ int main()
             if (count == 1) // Only support one ttf file dropped
             {
                 UnloadSpriteFont(font);
-                font = LoadSpriteFontTTF(droppedFiles[0], fontSize, 0, 0);
+                font = LoadSpriteFontEx(droppedFiles[0], fontSize, 0, 0);
                 ClearDroppedFiles();
             }
         }

docs/examples/web/audio/loader.html

@@ -36,7 +36,7 @@
 			}
             #eximage { width: 802px; height: 452px; text-align: center; }
 			#eximage img { margin: 0 auto; border: 1px solid; border-color: black; }
-            #eximage canvas { position: relative; top: 1px; left: 1px; border: 1px solid red; }
+            #eximage canvas { position: relative; top: 1px; left: 1px; border: 1px solid red; background: black; }
             pre { width: 802px!important;}
 			pre code{ border: 1px solid; border-color:#b0b0b0; height:auto; }
 			.exdownbtn{ margin-right: 20px; width:220px; height:30px; float:left; position: relative; cursor:pointer; font-weight:bold; font-size:10px; 

docs/examples/web/core/loader.html

@@ -36,7 +36,7 @@
 			}
             #eximage { width: 802px; height: 452px; text-align: center; }
 			#eximage img { margin: 0 auto; border: 1px solid; border-color: black; }
-            #eximage canvas { position: relative; top: 1px; left: 1px; border: 1px solid red; }
+            #eximage canvas { position: relative; top: 1px; left: 1px; border: 1px solid red; background: black; }
             pre { width: 802px!important;}
 			pre code{ border: 1px solid; border-color:#b0b0b0; height:auto; }
 			.exdownbtn{ margin-right: 20px; width:220px; height:30px; float:left; position: relative; cursor:pointer; font-weight:bold; font-size:10px; 

docs/examples/web/models/loader.html

@@ -36,7 +36,7 @@
 			}
             #eximage { width: 802px; height: 452px; text-align: center; }
 			#eximage img { margin: 0 auto; border: 1px solid; border-color: black; }
-            #eximage canvas { position: relative; top: 1px; left: 1px; border: 1px solid red; }
+            #eximage canvas { position: relative; top: 1px; left: 1px; border: 1px solid red; background: black; }
             pre { width: 802px!important;}
 			pre code{ border: 1px solid; border-color:#b0b0b0; height:auto; }
 			.exdownbtn{ margin-right: 20px; width:220px; height:30px; float:left; position: relative; cursor:pointer; font-weight:bold; font-size:10px; 

docs/examples/web/physac/loader.html

@@ -36,7 +36,7 @@
 			}
             #eximage { width: 802px; height: 452px; text-align: center; }
 			#eximage img { margin: 0 auto; border: 1px solid; border-color: black; }
-            #eximage canvas { position: relative; top: 1px; left: 1px; border: 1px solid red; }
+            #eximage canvas { position: relative; top: 1px; left: 1px; border: 1px solid red; background: black; }
             pre { width: 802px!important;}
 			pre code{ border: 1px solid; border-color:#b0b0b0; height:auto; }
 			.exdownbtn{ margin-right: 20px; width:220px; height:30px; float:left; position: relative; cursor:pointer; font-weight:bold; font-size:10px; 

docs/examples/web/shaders/loader.html

@@ -36,7 +36,7 @@
 			}
             #eximage { width: 802px; height: 452px; text-align: center; }
 			#eximage img { margin: 0 auto; border: 1px solid; border-color: black; }
-            #eximage canvas { position: relative; top: 1px; left: 1px; border: 1px solid red; }
+            #eximage canvas { position: relative; top: 1px; left: 1px; border: 1px solid red; background: black; }
             pre { width: 802px!important;}
 			pre code{ border: 1px solid; border-color:#b0b0b0; height:auto; }
 			.exdownbtn{ margin-right: 20px; width:220px; height:30px; float:left; position: relative; cursor:pointer; font-weight:bold; font-size:10px; 

docs/examples/web/shapes/loader.html

@@ -36,7 +36,7 @@
 			}
             #eximage { width: 802px; height: 452px; text-align: center; }
 			#eximage img { margin: 0 auto; border: 1px solid; border-color: black; }
-            #eximage canvas { position: relative; top: 1px; left: 1px; border: 1px solid red; }
+            #eximage canvas { position: relative; top: 1px; left: 1px; border: 1px solid red; background: black; }
             pre { width: 802px!important;}
 			pre code{ border: 1px solid; border-color:#b0b0b0; height:auto; }
 			.exdownbtn{ margin-right: 20px; width:220px; height:30px; float:left; position: relative; cursor:pointer; font-weight:bold; font-size:10px; 

docs/examples/web/text/loader.html

@@ -36,7 +36,7 @@
 			}
             #eximage { width: 802px; height: 452px; text-align: center; }
 			#eximage img { margin: 0 auto; border: 1px solid; border-color: black; }
-            #eximage canvas { position: relative; top: 1px; left: 1px; border: 1px solid red; }
+            #eximage canvas { position: relative; top: 1px; left: 1px; border: 1px solid red; background: black; }
             pre { width: 802px!important;}
 			pre code{ border: 1px solid; border-color:#b0b0b0; height:auto; }
 			.exdownbtn{ margin-right: 20px; width:220px; height:30px; float:left; position: relative; cursor:pointer; font-weight:bold; font-size:10px; 

docs/examples/web/text/text_ttf_loading.c

@@ -52,7 +52,7 @@ int main()
     // NOTE: Textures/Fonts MUST be loaded after Window initialization (OpenGL context is required)
     
     // TTF SpriteFont loading with custom generation parameters
-    font = LoadSpriteFontTTF("resources/KAISG.ttf", 96, 0, 0);
+    font = LoadSpriteFontEx("resources/KAISG.ttf", 96, 0, 0);
     
     // Generate mipmap levels to use trilinear filtering
     // NOTE: On 2D drawing it won't be noticeable, it looks like FILTER_BILINEAR
@@ -130,7 +130,7 @@ void UpdateDrawFrame(void)
         if (count == 1) // Only support one ttf file dropped
         {
             UnloadSpriteFont(font);
-            font = LoadSpriteFontTTF(droppedFiles[0], fontSize, 0, 0);
+            font = LoadSpriteFontEx(droppedFiles[0], fontSize, 0, 0);
             ClearDroppedFiles();
         }
     }

docs/examples/web/textures/loader.html

@@ -36,7 +36,7 @@
 			}
             #eximage { width: 802px; height: 452px; text-align: center; }
 			#eximage img { margin: 0 auto; border: 1px solid; border-color: black; }
-            #eximage canvas { position: relative; top: 1px; left: 1px; border: 1px solid red; }
+            #eximage canvas { position: relative; top: 1px; left: 1px; border: 1px solid red; background: black; }
             pre { width: 802px!important;}
 			pre code{ border: 1px solid; border-color:#b0b0b0; height:auto; }
 			.exdownbtn{ margin-right: 20px; width:220px; height:30px; float:left; position: relative; cursor:pointer; font-weight:bold; font-size:10px; 

docs/examples/web/textures/textures_raw_data.c

@@ -111,7 +111,7 @@ void UpdateDrawFrame(void)
 
         ClearBackground(RAYWHITE);
 
-        DrawTexture(checked, screenWidth/2 - checked.width/2, screenHeight/2 - checked.height/2, WHITE);
+        DrawTexture(checked, screenWidth/2 - checked.width/2, screenHeight/2 - checked.height/2, Fade(WHITE, 0.5f));
         DrawTexture(fudesumi, 430, -30, WHITE);
 
         DrawText("CHECKED TEXTURE ", 84, 100, 30, BROWN);

examples/Makefile

@@ -4,7 +4,7 @@
 #
 #   NOTE: By default examples are compiled using raylib static library and OpenAL Soft shared library
 #
-#   Copyright (c) 2013-2016 Ramon Santamaria (@raysan5)
+#   Copyright (c) 2013-2017 Ramon Santamaria (@raysan5)
 #
 #   This software is provided "as-is", without any express or implied warranty. In no event
 #   will the authors be held liable for any damages arising from the use of this software.
@@ -23,20 +23,22 @@
 #
 #**************************************************************************************************
 
+.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()
 PLATFORM ?= PLATFORM_DESKTOP
 
 # define NO to use OpenAL Soft as static library (shared by default)
-SHARED_OPENAL ?= YES
+SHARED_OPENAL ?= NO
 
 ifeq ($(PLATFORM),PLATFORM_WEB)
     SHARED_OPENAL = NO
 endif
 
 # define raylib directory for include and library
-RAYLIB_PATH = D:\GitHub\raylib
+RAYLIB_PATH ?= C:\raylib\raylib
 
 # determine PLATFORM_OS in case PLATFORM_DESKTOP selected
 ifeq ($(PLATFORM),PLATFORM_DESKTOP)
@@ -99,7 +101,7 @@ ifeq ($(PLATFORM),PLATFORM_WEB)
     # --memory-init-file 0        # to avoid an external memory initialization code file (.mem)
     # -s ALLOW_MEMORY_GROWTH=1    # to allow memory resizing
     # -s TOTAL_MEMORY=16777216    # to specify heap memory size (default = 16MB)
-    # -preload-file file.res      # embbed file.res resource into .data file
+    # --preload-file file.res     # embbed file.res resource into .data file
 endif
 ifeq ($(PLATFORM),PLATFORM_RPI)
     CFLAGS = -O2 -s -Wall -std=gnu99 -fgnu89-inline
@@ -174,7 +176,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
         # requires the following packages:
         # libglfw3-dev libopenal-dev libegl1-mesa-dev
         LIBS = -lraylib -lglfw3 -lGL -lopenal -lm -lpthread -ldl
-        # on XWindow could require also below libraries, just uncomment
+        # on XWindow requires also below libraries
         LIBS += -lX11 -lXrandr -lXinerama -lXi -lXxf86vm -lXcursor
     else
     ifeq ($(PLATFORM_OS),OSX)
@@ -202,7 +204,7 @@ ifeq ($(PLATFORM),PLATFORM_RPI)
     LIBS = -lraylib -lGLESv2 -lEGL -lpthread -lrt -lm -lbcm_host -lopenal
 endif
 ifeq ($(PLATFORM),PLATFORM_WEB)
-    # just adjust the correct path to libraylib.bc
+    # NOTE: Set the correct path to libraylib.bc
     LIBS = $(RAYLIB_RELEASE)/libraylib.bc
 endif
 
@@ -282,8 +284,7 @@ EXAMPLES = \
     fix_dylib \
 
 
-# typing 'make' will invoke the default target entry called 'all',
+# typing 'make' will invoke the default target entry
-# in this case, the 'default' target entry is raylib
 all: examples
 
 # generic compilation pattern

examples/text/text_ttf_loading.c

@@ -25,7 +25,7 @@ int main()
     // NOTE: Textures/Fonts MUST be loaded after Window initialization (OpenGL context is required)
     
     // TTF SpriteFont loading with custom generation parameters
-    SpriteFont font = LoadSpriteFontTTF("resources/KAISG.ttf", 96, 0, 0);
+    SpriteFont font = LoadSpriteFontEx("resources/KAISG.ttf", 96, 0, 0);
     
     // Generate mipmap levels to use trilinear filtering
     // NOTE: On 2D drawing it won't be noticeable, it looks like FILTER_BILINEAR
@@ -82,7 +82,7 @@ int main()
             if (count == 1) // Only support one ttf file dropped
             {
                 UnloadSpriteFont(font);
-                font = LoadSpriteFontTTF(droppedFiles[0], fontSize, 0, 0);
+                font = LoadSpriteFontEx(droppedFiles[0], fontSize, 0, 0);
                 ClearDroppedFiles();
             }
         }

games/drturtle/makefile

@@ -1,8 +1,8 @@
 #**************************************************************************************************
 #
-#   raylib - makefile to compile Dr.Turtle game
+#   raylib makefile for desktop platforms, Raspberry Pi and HTML5 (emscripten)
 #
-#   Copyright (c) 2014 Ramon Santamaria (@raysan5)
+#   Copyright (c) 2013-2017 Ramon Santamaria (@raysan5)
 #
 #   This software is provided "as-is", without any express or implied warranty. In no event
 #   will the authors be held liable for any damages arising from the use of this software.
@@ -21,10 +21,23 @@
 #
 #**************************************************************************************************
 
-# define raylib platform if not defined (by default, compile for RPI)
+.PHONY: all clean
-# Other possible platform: PLATFORM_DESKTOP
+
+# 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()
 PLATFORM ?= PLATFORM_DESKTOP
 
+# define NO to use OpenAL Soft as static library (shared by default)
+SHARED_OPENAL ?= NO
+
+ifeq ($(PLATFORM),PLATFORM_WEB)
+    SHARED_OPENAL = NO
+endif
+
+# define raylib directory for include and library
+RAYLIB_PATH ?= C:\raylib\raylib
+
 # 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
@@ -60,48 +73,96 @@ endif
 endif
 
 # define compiler flags:
-#  -O2         defines optimization level
+#  -O2                  defines optimization level
-#  -Wall       turns on most, but not all, compiler warnings
+#  -Og                  enable debugging
-#  -std=c99    use standard C from 1999 revision
+#  -s                   strip unnecessary data from build
-ifeq ($(PLATFORM),PLATFORM_RPI)
+#  -Wall                turns on most, but not all, compiler warnings
-    CFLAGS = -O2 -Wall -std=gnu99 -fgnu89-inline
+#  -std=c99             defines C language mode (standard C from 1999 revision)
-else
+#  -std=gnu99           defines C language mode (GNU C from 1999 revision)
-    CFLAGS = -O2 -Wall -std=c99 
+#  -fgnu89-inline       declaring inline functions support (GCC optimized)
+#  -Wno-missing-braces  ignore invalid warning (GCC bug 53119)
+#  -D_DEFAULT_SOURCE    use with -std=c99 on Linux and PLATFORM_WEB, required for timespec
+ifeq ($(PLATFORM),PLATFORM_DESKTOP)
+    ifeq ($(PLATFORM_OS),WINDOWS)
+        CFLAGS = -O2 -s -Wall -std=c99
+    endif
+    ifeq ($(PLATFORM_OS),LINUX)
+        CFLAGS = -O2 -s -Wall -std=c99 -D_DEFAULT_SOURCE
+    endif
+    ifeq ($(PLATFORM_OS),OSX)
+        CFLAGS = -O2 -s -Wall -std=c99
+    endif
 endif
 ifeq ($(PLATFORM),PLATFORM_WEB)
-    CFLAGS = -O1 -Wall -std=c99 -s USE_GLFW=3 --preload-file resources -s ALLOW_MEMORY_GROWTH=1 --shell-file ../../templates/web_shell/shell.html
+    CFLAGS = -O1 -Wall -std=c99 -D_DEFAULT_SOURCE -s USE_GLFW=3 -s ASSERTIONS=1 -s ALLOW_MEMORY_GROWTH=1 --profiling --preload-file resources
-    #-s ASSERTIONS=1 --preload-file resources
+    # -O2                         # if used, also set --memory-init-file 0
-    #-s ALLOW_MEMORY_GROWTH=1   # to allow memory resizing
+    # --memory-init-file 0        # to avoid an external memory initialization code file (.mem)
-    #-s TOTAL_MEMORY=16777216   # to specify heap memory size (default = 16MB)
+    # -s ALLOW_MEMORY_GROWTH=1    # to allow memory resizing
+    # -s TOTAL_MEMORY=16777216    # to specify heap memory size (default = 16MB)
+    # --preload-file file.res     # embbed file.res resource into .data file
+endif
+ifeq ($(PLATFORM),PLATFORM_RPI)
+    CFLAGS = -O2 -s -Wall -std=gnu99 -fgnu89-inline
+endif
+#CFLAGSEXTRA = -Wextra -Wmissing-prototypes -Wstrict-prototypes
+
+# define raylib release directory for compiled library
+ifeq ($(PLATFORM),PLATFORM_DESKTOP)
+    ifeq ($(PLATFORM_OS),WINDOWS)
+        RAYLIB_RELEASE = $(RAYLIB_PATH)/release/win32/mingw32
+    endif
+    ifeq ($(PLATFORM_OS),LINUX)
+        RAYLIB_RELEASE = $(RAYLIB_PATH)/release/linux
+    endif
+    ifeq ($(PLATFORM_OS),OSX)
+        RAYLIB_RELEASE = $(RAYLIB_PATH)/release/osx
+    endif
+endif
+ifeq ($(PLATFORM),PLATFORM_WEB)
+    RAYLIB_RELEASE = $(RAYLIB_PATH)/release/html5
+endif
+ifeq ($(PLATFORM),PLATFORM_RPI)
+    RAYLIB_RELEASE = $(RAYLIB_PATH)/release/rpi
 endif
 
 # define any directories containing required header files
+INCLUDES = -I. -I$(RAYLIB_RELEASE) -I$(RAYLIB_PATH)/src -I$(RAYLIB_PATH)/src/external 
+
 ifeq ($(PLATFORM),PLATFORM_RPI)
-    INCLUDES = -I. -I../../src -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads
+    INCLUDES += -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads
-else
+endif
-    INCLUDES = -I. -I../../src
+ifeq ($(PLATFORM),PLATFORM_DESKTOP)
-# external libraries headers
+    ifeq ($(PLATFORM_OS),WINDOWS)
-# GLFW3
+        # external libraries headers
-    INCLUDES += -I../../external/glfw3/include
+        # GLFW3
-# GLEW
+            INCLUDES += -I$(RAYLIB_PATH)/src/external/glfw3/include
-    INCLUDES += -I../../external/glew/include
+        # OpenAL Soft
-# OpenAL Soft
+            INCLUDES += -I$(RAYLIB_PATH)/src/external/openal_soft/include
-    INCLUDES += -I../../external/openal_soft/include
+    endif
+    ifeq ($(PLATFORM_OS),LINUX)
+        # you may optionally create this directory and install raylib 
+        # and related headers there. Edit ../src/Makefile appropriately.
+            INCLUDES += -I/usr/local/include/raylib
+    endif
+    ifeq ($(PLATFORM_OS),OSX)
+        # additional directories for MacOS
+    endif
 endif
 
 # define library paths containing required libs
+LFLAGS = -L. -L$(RAYLIB_RELEASE) -L$(RAYLIB_PATH)/src 
+
 ifeq ($(PLATFORM),PLATFORM_RPI)
-    LFLAGS = -L. -L../../src -L/opt/vc/lib
+    LFLAGS += -L/opt/vc/lib
-else
+endif
-    LFLAGS = -L. -L../../src
+ifeq ($(PLATFORM),PLATFORM_DESKTOP)
-    # external libraries to link with
+    # add standard directories for GNU/Linux
-    # GLFW3
+    ifeq ($(PLATFORM_OS),WINDOWS)
-    LFLAGS += -L../../external/glfw3/lib/$(LIBPATH)
+        # external libraries to link with
-    ifneq ($(PLATFORM_OS),OSX)
+        # GLFW3
-    # OpenAL Soft
+            LFLAGS += -L$(RAYLIB_PATH)/src/external/glfw3/lib/$(LIBPATH)
-        LFLAGS += -L../../external/openal_soft/lib/$(LIBPATH)
+        # OpenAL Soft
-	# GLEW
+            LFLAGS += -L$(RAYLIB_PATH)/src/external/openal_soft/lib/$(LIBPATH)
-        LFLAGS += -L../../external/glew/lib/$(LIBPATH)
     endif
 endif
 
@@ -111,20 +172,27 @@ 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 -lGLEW -lGL -lopenal -lm -pthread -ldl
+        LIBS = -lraylib -lglfw3 -lGL -lopenal -lm -lpthread -ldl
-        # on XWindow could require also below libraries, just uncomment
+        # on XWindow requires also below libraries
         LIBS += -lX11 -lXrandr -lXinerama -lXi -lXxf86vm -lXcursor
     else
     ifeq ($(PLATFORM_OS),OSX)
-    	# libraries for OS X 10.9 desktop compiling
+        # libraries for OSX 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
+        LIBS = -lraylib -lglfw -framework OpenGL -framework OpenAL -framework Cocoa
     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 -lopengl32 -lgdi32
+        # if static OpenAL Soft required, define the corresponding libs
+        ifeq ($(SHARED_OPENAL),NO)
+            LIBS += -lopenal32 -lwinmm
+            CFLAGS += -Wl,-allow-multiple-definition
+        else
+            LIBS += -lopenal32dll
+        endif
     endif
     endif
 endif
@@ -134,30 +202,31 @@ ifeq ($(PLATFORM),PLATFORM_RPI)
     LIBS = -lraylib -lGLESv2 -lEGL -lpthread -lrt -lm -lbcm_host -lopenal
 endif
 ifeq ($(PLATFORM),PLATFORM_WEB)
-    LIBS = ../../src/libraylib.bc
+    # NOTE: Set the correct path to libraylib.bc
+    LIBS = $(RAYLIB_RELEASE)/libraylib.bc
 endif
 
 # define additional parameters and flags for windows
 ifeq ($(PLATFORM_OS),WINDOWS)
     # resources file contains windows exe icon
     # -Wl,--subsystem,windows hides the console window
-    WINFLAGS = ../../src/resources -Wl,--subsystem,windows
+    WINFLAGS = $(RAYLIB_PATH)/src/resources -Wl,--subsystem,windows
 endif
 
 ifeq ($(PLATFORM),PLATFORM_WEB)
     EXT = .html
+    WEB_SHELL = --shell-file $(RAYLIB_PATH)\templates\web_shell\shell.html
 endif
 
 # define all screen object files required
 SCREENS = \
 
-# typing 'make' will invoke the first target entry in the file,
+# typing 'make' will invoke the default target entry
-# in this case, the 'default' target entry is advance_game
 default: drturtle
 
-# compile template - advance_game
+# compile program
 drturtle: drturtle_final_web.c $(SCREENS)
-	$(CC) -o $@$(EXT) $< $(SCREENS) $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS)
+	$(CC) -o $@$(EXT) $^ $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS) $(WEB_SHELL)
 
 # clean everything
 clean:
@@ -167,10 +236,9 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
 		rm -f *.o
     else
     ifeq ($(PLATFORM_OS),LINUX)
-		find . -type f -executable -delete
+		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
     else
-		del *.o *.exe
+		del *.o *.exe /s
     endif
     endif
 endif