Merge pull request #84 from raysan5/develop

Integrate Develop branch
author: Ray <raysan5@gmail.com> 2016-02-21 02:30:28 +0100
committer: Ray <raysan5@gmail.com> 2016-02-21 02:30:28 +0100
commit: 2d1b2efb92725d6cf4a8b4f0660c739382d01f39 (patch)
tree: 6b42c14cd9fa22e53e67ff53ce133aaadc3de987
parent: 4b6e6d4dd45fc3a47b82af7eeb60871140a7eccf (diff)
parent: 9ec47768121766cf12fef5d1bab8c8302cdac3a6 (diff)
download: raylib-2d1b2efb92725d6cf4a8b4f0660c739382d01f39.tar.gz
raylib-2d1b2efb92725d6cf4a8b4f0660c739382d01f39.zip
35 files changed, 1268 insertions, 162 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 2af57c2c..795a2ee5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,12 +1,49 @@
 changelog
 ---------
 
-Current Release:    raylib 1.3.0 (03 September 2015)
+Current Release:    raylib 1.4.0 (22 February 2016)
 
 NOTE: Only versions marked as 'Release' are available in installer, updates are only available as source.
 NOTE: Current Release includes all previous updates.
 
 -----------------------------------------------
+Release:     raylib 1.4.0 (22 February 2016)
+-----------------------------------------------
+NOTE: 
+  This version supposed another big improvement for raylib, inlcuding new modules and new features.
+  More than 30 new functions have been added to previous raylib version.
+  Around 8 new examples and +10 new game samples have been added.
+
+BIG changes:
+[textures] IMAGE MANIPULATION: Functions to crop, resize, colorize, flip, dither and even draw image-to-image or text-to-image.
+[text] SPRITEFONT SUPPORT: Added support for AngelCode fonts (.fnt) and TrueType fonts (.ttf).
+[gestures] REDESIGN: Gestures system simplified and prepared to process generic touch events, including mouse events (multiplatform).
+[physac] NEW MODULE: Basic 2D physics support, use colliders and rigidbodies; apply forces to physic objects.
+
+other changes:
+[rlgl] Removed GLEW library dependency, now using GLAD
+[rlgl] Implemented alternative to glGetTexImage() on OpenGL ES
+[rlgl] Using depth data on batch drawing
+[rlgl] Reviewed glReadPixels() function
+[core][rlgl] Reviewed raycast system, now 3D picking works
+[core] Android: Reviewed Android App cycle, paused if inactive
+[shaders] Implemented Blinn-Phong lighting shading model
+[textures] Implemented Floyd-Steinberg dithering - ImageDither()
+[text] Added line-break support to DrawText()
+[text] Added TrueType Fonts support (using stb_truetype)
+[models] Implement function: CalculateBoundingBox(Mesh mesh)
+[models] Added functions to check Ray collisions
+[models] Improve map resolution control on LoadHeightmap()
+[camera] Corrected small-glitch on zoom-in with mouse-wheel
+[gestures] Implemented SetGesturesEnabled() to enable only some gestures
+[gestures] Implemented GetElapsedTime() on Windows system
+[gestures] Support mouse gestures for desktop platforms
+[raymath] Complete review of the module and converted to header-only
+[easings] Added new module for easing animations
+[stb] Updated to latest headers versions
+[*] Lots of tweaks around
+
+-----------------------------------------------
 Release:     raylib 1.3.0 (01 September 2015)
 -----------------------------------------------
 NOTE: 
diff --git a/HELPME.md b/HELPME.md
index 8a0ada18..b4f0219f 100644
--- a/HELPME.md
+++ b/HELPME.md
@@ -32,6 +32,8 @@ contact
    * Webpage: [http://www.raylib.com](http://www.raylib.com)
    * Twitter: [http://www.twitter.com/raysan5](http://www.twitter.com/raysan5)
    * Facebook: [http://www.facebook.com/raylibgames](http://www.facebook.com/raylibgames)
-
+   * Reddit: [https://www.reddit.com/r/raylib](https://www.reddit.com/r/raylib)
+   * Twitch: [http://www.twitch.tv/raysan5](http://www.twitch.tv/raysan5)
+   * Patreon: [https://www.patreon.com/raysan5](https://www.patreon.com/raysan5)
    
-[raysan5]: mailto:raysan@raysanweb.com "Ramon Santamaria - Ray San"
+[raysan5]: mailto:raysan5@gmail.com "Ramon Santamaria - Ray San"
diff --git a/README.md b/README.md
index f9a5a0e2..fab198bd 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,6 @@ about
 raylib is a simple and easy-to-use library to learn videogames programming.
 
 raylib is highly inspired by Borland BGI graphics lib and by XNA framework. 
-Allegro and SDL have also been analyzed for reference.
 
 NOTE for ADVENTURERS: raylib is a programming library to learn videogames programming; 
 no fancy interface, no visual helpers, no auto-debugging... just coding in the most 
@@ -15,7 +14,7 @@ pure spartan-programmers way. Are you ready to learn? Jump to [code examples!](h
 history
 -------
 
-I've developed videogames for some years and last year I had to taught videogames development 
+I've developed videogames for some years and 4 year ago I started teaching videogames development 
 to young people with artistic profile, most of them had never written a single line of code.
 
 I started with C language basis and, after searching for the most simple and easy-to-use library to teach 
@@ -102,25 +101,28 @@ Lots of code changes and lot of testing have concluded in this amazing new rayli
 notes on raylib 1.4
 -------------------
 
-On February 2016, after 4 months of raylib 1.3 release, it comes raylib 1.4.
+On February 2016, after 4 months of raylib 1.3 release, it comes raylib 1.4. For this new version, lots of parts of the library have been reviewed to better accomodate the shaders system.
+Lots of bugs have been solved and some missing features have been added to the library.
 
-Lots of parts of the library have been reviewed to better accomodate to shaders systems and multiple new features have been added.
+SpriteFonts system has been improved, adding support for AngelCode fonts (.fnt) and TTF fonts (using stb_truetype helper library).
 
-SpriteFonts system has been improved, adding support for AngelCode fonts (.fnt) and TTF fonts (using stb_truetype).
+A set of Image manipulation functions have been added to crop, resize, colorize, flip, dither and even draw image-to-image or text-to-image.
 
-Finally, raycast system for 3D picking is working, including some ray collision-detection functions.
+[raymath](https://github.com/raysan5/raylib/blob/develop/src/raymath.h) module has been reviewed and converted to a header-only file for easier portability, functions can also be used as inline.
 
-A set of Image manipulation functions have been added to crop, resize, colorize, dither and even draw image-to-image or text-to-image.
+Raycast system for 3D picking is now fully functional, including some ray collision-detection functions.
 
-Two new functions added for persistent data storage.
+[raymath](https://github.com/raysan5/raylib/blob/develop/src/gestures.c) module has redesigned and simplified, now it can process touch events from any source, including mouse. This way, gestures system can be used for any platform.
 
-New [physac](https://github.com/raysan5/raylib/blob/develop/src/physac.h) physics module!
+Raspberry Pi input system has been redesigned to better read raw inputs using generic Linux event handlers (keyboard:`stdin`, mouse:`/dev/input/mouse0`, gamepad:`/dev/input/js0`). Gamepad support has been added.
 
-Complete LUA scripting support to allow raylib usage from LUA and LUA scripts support within raylib.
+Two new functions added for persistent data storage. Now raylib user can save and load game data in a file.
 
-Up to 8 new examples have been added to show the new raylib features.
+[physac](https://github.com/raysan5/raylib/blob/develop/src/physac.h) physics module added. Basic 2D physics support.
 
-Lots of code changes and lot of testing have concluded in this amazing new raylib 1.4.
+Up to 8 new examples have been added to show the new raylib features... and +10 game samples to learn how to create some classic games like Arkanoid, Asteroids, Missile Commander, Snake or Tetris.
+
+Lots of code changes and lots of hours of hard work have concluded in this amazing new raylib 1.4.
 
 features
 --------
@@ -130,7 +132,7 @@ features
    *  Hardware accelerated with OpenGL (1.1, 3.3 or ES2)
    *  Unique OpenGL abstraction layer (usable as standalone module): [rlgl](https://github.com/raysan5/raylib/blob/master/src/rlgl.c) 
    *  Powerful fonts module with multiple SpriteFonts formats support (XNA bitmap fonts, AngelCode fonts, TTF)
-   *  Outstanding texture formats support, including compressed formats
+   *  Outstanding texture formats support, including compressed formats (DXT, ETC, PVRT, ASTC)
    *  Basic 3d support for Shapes, Models, Billboards, Heightmaps and Cubicmaps
    *  Powerful math module for Vector and Matrix operations: [raymath](https://github.com/raysan5/raylib/blob/master/src/raymath.c) 
    *  Audio loading and playing with streaming support (WAV and OGG)
@@ -181,6 +183,9 @@ contact
    * Webpage: [http://www.raylib.com](http://www.raylib.com)
    * Twitter: [http://www.twitter.com/raysan5](http://www.twitter.com/raysan5)
    * Facebook: [http://www.facebook.com/raylibgames](http://www.facebook.com/raylibgames)
+   * Reddit: [https://www.reddit.com/r/raylib](https://www.reddit.com/r/raylib)
+   * Twitch: [http://www.twitch.tv/raysan5](http://www.twitch.tv/raysan5)
+   * Patreon: [https://www.patreon.com/raysan5](https://www.patreon.com/raysan5)
 
 If you are using raylib and you enjoy it, please, [let me know][raysan5].
 
diff --git a/ROADMAP.md b/ROADMAP.md
index e0d0c825..0481aaf2 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -1,28 +1,37 @@
 roadmap
 -------
 
-Current version of raylib is quite complete and functional but there is still a lot of things I would like to improve.
-Here it is a list of features I would like to add and functions to improve.
-
-Around the source code there are multiple TODO points with pending revisions/bugs and here it is a list of desired features.
-
-raylib v1.4
-
-   [DONE] TTF fonts support (using stb_truetype)
-   [DONE] Raycast system for 3D picking (including collisions detection)
-   [DONE] Floyd-Steinberg dithering on 16bit image format conversion
-   [DONE] Basic image manipulation functions (crop, resize, draw...)
-   [DONE] Storage load/save data functionality
-   [DONE] Physics module
-   [IN PROGRESS] LUA scripting support (wrapper to lua lib)
-   - Remove GLEW dependency (use another solution... glad?)
-   - Basic image procedural generation (spot, gradient, noise...)
-   - Basic GPU stats sytem (memory, draws, time...)
-   
-   
-Check [GITHUB ISSUES][issues] for further details on implementation status for this features!
+Current version of raylib is quite complete and functional but there is still a lot of things to add and improve.
+Here it is a wish list of features I would like to add and functions to improve.
+
+Note that around the raylib source code there are multiple TODO points with pending revisions/bugs. Check [GITHUB ISSUES][issues] for further details!
+
+raylib 1.5
+
+    Redesign Shaders/Textures system, use Materials
+    Redesign physics module (physac)
+    Basic GPU stats sytem (memory, draws, time...)
+    Procedural image generation functions (spot, gradient, noise...)
+    Procedural mesh generation functions (cube, cone, sphere...)
+    Touch-based camera controls for Android
+    Skybox and Fog support
+    [IN PROGRESS] LUA scripting support (wrapper to lua lib)
+
+raylib 1.4
+
+    [DONE] TTF fonts support (using stb_truetype)
+    [DONE] Raycast system for 3D picking (including collisions detection)
+    [DONE] Floyd-Steinberg dithering on 16bit image format conversion
+    [DONE] Basic image manipulation functions (crop, resize, draw...)
+    [DONE] Storage load/save data functionality
+    [DONE] Add Physics module (physac)
+    [DONE] Remove GLEW dependency -> Replaced by GLAD
+    [DONE] Redesign Raspberry PI inputs system
+    [DONE] Redesign gestures module to be multiplatform
+    [DONE] Module raymath as header-only and functions inline
+    [DONE] Add Easings module (easings.h)
 
 Any feature missing? Do you have a request? [Let me know!][raysan5]
 
-[raysan5]: mailto:raysan@raysanweb.com "Ramon Santamaria - Ray San"
+[raysan5]: mailto:raysan5@gmail.com "Ramon Santamaria - Ray San"
 [isssues]: https://github.com/raysan5/raylib/issues
diff --git a/examples/resources/cat.png b/examples/resources/cat.png
index 9b5c08d2..d023aa21 100644
--- a/examples/resources/cat.png
+++ b/examples/resources/cat.png
diff --git a/examples/textures_image_drawing.c b/examples/textures_image_drawing.c
index e09828d5..1c6a1fb9 100644
--- a/examples/textures_image_drawing.c
+++ b/examples/textures_image_drawing.c
@@ -25,14 +25,14 @@ int main()
     // NOTE: Textures MUST be loaded after Window initialization (OpenGL context is required)
 
     Image cat = LoadImage("resources/cat.png");             // Load image in CPU memory (RAM)
-    ImageCrop(&cat, (Rectangle){ 170, 120, 280, 380 });     // Crop an image piece
+    ImageCrop(&cat, (Rectangle){ 100, 10, 280, 380 });      // Crop an image piece
     ImageFlipHorizontal(&cat);                              // Flip cropped image horizontally
     ImageResize(&cat, 150, 200);                            // Resize flipped-cropped image
     
     Image parrots = LoadImage("resources/parrots.png");     // Load image in CPU memory (RAM)
     
     // Draw one image over the other with a scaling of 1.5f
-    ImageDraw(&parrots, cat, (Rectangle){ 0, 0, cat.width, cat.height}, (Rectangle){ 30, 40, cat.width*1.5f, cat.height*1.5f });
+    ImageDraw(&parrots, cat, (Rectangle){ 0, 0, cat.width, cat.height }, (Rectangle){ 30, 40, cat.width*1.5f, cat.height*1.5f });
     ImageCrop(&parrots, (Rectangle){ 0, 50, parrots.width, parrots.height - 100 }); // Crop resulting image
     
     UnloadImage(cat);       // Unload image from RAM
diff --git a/games/samples/arkanoid.c b/games/arkanoid.c
index f10f9383..f10f9383 100644
--- a/games/samples/arkanoid.c
+++ b/games/arkanoid.c
diff --git a/games/samples/asteroids.c b/games/asteroids.c
index 53ebbd8e..53ebbd8e 100644
--- a/games/samples/asteroids.c
+++ b/games/asteroids.c
diff --git a/games/samples/asteroids_survival.c b/games/asteroids_survival.c
index aa21112d..aa21112d 100644
--- a/games/samples/asteroids_survival.c
+++ b/games/asteroids_survival.c
diff --git a/games/drturtle/04_drturtle_gui.c b/games/drturtle/04_drturtle_gui.c
index 0e648b5d..bbfd3492 100644
--- a/games/drturtle/04_drturtle_gui.c
+++ b/games/drturtle/04_drturtle_gui.c
@@ -338,7 +338,7 @@ int main()
                     DrawTexture(title, screenWidth/2 - title.width/2, screenHeight/2 - title.height/2 - 80, WHITE);
                     
                     // Draw blinking text
-                    if ((framesCounter/30) % 2) DrawTextEx(font, "PRESS ENTER", (Vector2){ screenWidth/2 - 150, 480 }, GetFontBaseSize(font), 0, WHITE);
+                    if ((framesCounter/30) % 2) DrawTextEx(font, "PRESS ENTER", (Vector2){ screenWidth/2 - 150, 480 }, font.size, 0, WHITE);
                 
                 } break;
                 case GAMEPLAY:
@@ -388,8 +388,8 @@ int main()
                     DrawRectangle(20, 20, foodBar, 40, ORANGE);
                     DrawRectangleLines(20, 20, 400, 40, BLACK);
                     
-                    DrawTextEx(font, FormatText("SCORE: %04i", score), (Vector2){ screenWidth - 300, 20 }, GetFontBaseSize(font), -2, ORANGE);
-                    DrawTextEx(font, FormatText("DISTANCE: %04i", (int)distance), (Vector2){ 550, 20 }, GetFontBaseSize(font), -2, ORANGE);
+                    DrawTextEx(font, FormatText("SCORE: %04i", score), (Vector2){ screenWidth - 300, 20 }, font.size, -2, ORANGE);
+                    DrawTextEx(font, FormatText("DISTANCE: %04i", (int)distance), (Vector2){ 550, 20 }, font.size, -2, ORANGE);
                     
                     if (gameraMode)
                     {
@@ -403,15 +403,15 @@ int main()
                     // Draw a transparent black rectangle that covers all screen
                     DrawRectangle(0, 0, screenWidth, screenHeight, Fade(BLACK, 0.4f));
                 
-                    DrawTextEx(font, "GAME OVER", (Vector2){ 300, 160 }, GetFontBaseSize(font)*3, -2, MAROON);
+                    DrawTextEx(font, "GAME OVER", (Vector2){ 300, 160 }, font.size*3, -2, MAROON);
                     
-                    DrawTextEx(font, FormatText("SCORE: %04i", score), (Vector2){ 680, 350 }, GetFontBaseSize(font), -2, GOLD);
-                    DrawTextEx(font, FormatText("DISTANCE: %04i", (int)distance), (Vector2){ 290, 350 }, GetFontBaseSize(font), -2, GOLD);
-                    DrawTextEx(font, FormatText("HISCORE: %04i", hiscore), (Vector2){ 665, 400 }, GetFontBaseSize(font), -2, ORANGE);
-                    DrawTextEx(font, FormatText("HIDISTANCE: %04i", (int)hidistance), (Vector2){ 270, 400 }, GetFontBaseSize(font), -2, ORANGE);
+                    DrawTextEx(font, FormatText("SCORE: %04i", score), (Vector2){ 680, 350 }, font.size, -2, GOLD);
+                    DrawTextEx(font, FormatText("DISTANCE: %04i", (int)distance), (Vector2){ 290, 350 }, font.size, -2, GOLD);
+                    DrawTextEx(font, FormatText("HISCORE: %04i", hiscore), (Vector2){ 665, 400 }, font.size, -2, ORANGE);
+                    DrawTextEx(font, FormatText("HIDISTANCE: %04i", (int)hidistance), (Vector2){ 270, 400 }, font.size, -2, ORANGE);
                     
                     // Draw blinking text
-                    if ((framesCounter/30) % 2) DrawTextEx(font, "PRESS ENTER to REPLAY", (Vector2){ screenWidth/2 - 250, 520 }, GetFontBaseSize(font), -2, LIGHTGRAY);
+                    if ((framesCounter/30) % 2) DrawTextEx(font, "PRESS ENTER to REPLAY", (Vector2){ screenWidth/2 - 250, 520 }, font.size, -2, LIGHTGRAY);
                     
                 } break;
                 default: break;
diff --git a/games/drturtle/05_drturtle_audio.c b/games/drturtle/05_drturtle_audio.c
index 7e8cac70..4a36d015 100644
--- a/games/drturtle/05_drturtle_audio.c
+++ b/games/drturtle/05_drturtle_audio.c
@@ -351,7 +351,7 @@ int main()
                     DrawTexture(title, screenWidth/2 - title.width/2, screenHeight/2 - title.height/2 - 80, WHITE);
                     
                     // Draw blinking text
-                    if ((framesCounter/30) % 2) DrawTextEx(font, "PRESS ENTER", (Vector2){ screenWidth/2 - 150, 480 }, GetFontBaseSize(font), 0, WHITE);
+                    if ((framesCounter/30) % 2) DrawTextEx(font, "PRESS ENTER", (Vector2){ screenWidth/2 - 150, 480 }, font.size, 0, WHITE);
                 
                 } break;
                 case GAMEPLAY:
@@ -401,8 +401,8 @@ int main()
                     DrawRectangle(20, 20, foodBar, 40, ORANGE);
                     DrawRectangleLines(20, 20, 400, 40, BLACK);
                     
-                    DrawTextEx(font, FormatText("SCORE: %04i", score), (Vector2){ screenWidth - 300, 20 }, GetFontBaseSize(font), -2, ORANGE);
-                    DrawTextEx(font, FormatText("DISTANCE: %04i", (int)distance), (Vector2){ 550, 20 }, GetFontBaseSize(font), -2, ORANGE);
+                    DrawTextEx(font, FormatText("SCORE: %04i", score), (Vector2){ screenWidth - 300, 20 }, font.size, -2, ORANGE);
+                    DrawTextEx(font, FormatText("DISTANCE: %04i", (int)distance), (Vector2){ 550, 20 }, font.size, -2, ORANGE);
                     
                     if (gameraMode)
                     {
@@ -416,15 +416,15 @@ int main()
                     // Draw a transparent black rectangle that covers all screen
                     DrawRectangle(0, 0, screenWidth, screenHeight, Fade(BLACK, 0.4f));
                 
-                    DrawTextEx(font, "GAME OVER", (Vector2){ 300, 160 }, GetFontBaseSize(font)*3, -2, MAROON);
+                    DrawTextEx(font, "GAME OVER", (Vector2){ 300, 160 }, font.size*3, -2, MAROON);
                     
-                    DrawTextEx(font, FormatText("SCORE: %04i", score), (Vector2){ 680, 350 }, GetFontBaseSize(font), -2, GOLD);
-                    DrawTextEx(font, FormatText("DISTANCE: %04i", (int)distance), (Vector2){ 290, 350 }, GetFontBaseSize(font), -2, GOLD);
-                    DrawTextEx(font, FormatText("HISCORE: %04i", hiscore), (Vector2){ 665, 400 }, GetFontBaseSize(font), -2, ORANGE);
-                    DrawTextEx(font, FormatText("HIDISTANCE: %04i", (int)hidistance), (Vector2){ 270, 400 }, GetFontBaseSize(font), -2, ORANGE);
+                    DrawTextEx(font, FormatText("SCORE: %04i", score), (Vector2){ 680, 350 }, font.size, -2, GOLD);
+                    DrawTextEx(font, FormatText("DISTANCE: %04i", (int)distance), (Vector2){ 290, 350 }, font.size, -2, GOLD);
+                    DrawTextEx(font, FormatText("HISCORE: %04i", hiscore), (Vector2){ 665, 400 }, font.size, -2, ORANGE);
+                    DrawTextEx(font, FormatText("HIDISTANCE: %04i", (int)hidistance), (Vector2){ 270, 400 }, font.size, -2, ORANGE);
                     
                     // Draw blinking text
-                    if ((framesCounter/30) % 2) DrawTextEx(font, "PRESS ENTER to REPLAY", (Vector2){ screenWidth/2 - 250, 520 }, GetFontBaseSize(font), -2, LIGHTGRAY);
+                    if ((framesCounter/30) % 2) DrawTextEx(font, "PRESS ENTER to REPLAY", (Vector2){ screenWidth/2 - 250, 520 }, font.size, -2, LIGHTGRAY);
                     
                 } break;
                 default: break;
diff --git a/games/drturtle/06_drturtle_final.c b/games/drturtle/06_drturtle_final.c
index a3475de4..128b23a5 100644
--- a/games/drturtle/06_drturtle_final.c
+++ b/games/drturtle/06_drturtle_final.c
@@ -21,6 +21,8 @@
 
 #include "raylib.h"
 
+#include <math.h>        // Used for sinf()
+
 #define MAX_ENEMIES 10
 
 typedef enum { TITLE, GAMEPLAY, ENDING } GameScreen;
@@ -128,7 +130,7 @@ int main()
         framesCounter++;
         
         // Sea color tint effect
-        blue = 210 + 25 * sin(timeCounter);
+        blue = 210 + 25 * sinf(timeCounter);
         timeCounter += 0.01;
 
         // Game screens management
@@ -374,7 +376,7 @@ int main()
                     DrawTexture(title, screenWidth/2 - title.width/2, screenHeight/2 - title.height/2 - 80, WHITE);
                     
                     // Draw blinking text
-                    if ((framesCounter/30) % 2) DrawTextEx(font, "PRESS ENTER", (Vector2){ screenWidth/2 - 150, 480 }, GetFontBaseSize(font), 0, WHITE);
+                    if ((framesCounter/30) % 2) DrawTextEx(font, "PRESS ENTER", (Vector2){ screenWidth/2 - 150, 480 }, font.size, 0, WHITE);
                 
                 } break;
                 case GAMEPLAY:
@@ -424,8 +426,8 @@ int main()
                     DrawRectangle(20, 20, foodBar, 40, ORANGE);
                     DrawRectangleLines(20, 20, 400, 40, BLACK);
                     
-                    DrawTextEx(font, FormatText("SCORE: %04i", score), (Vector2){ screenWidth - 300, 20 }, GetFontBaseSize(font), -2, ORANGE);
-                    DrawTextEx(font, FormatText("DISTANCE: %04i", (int)distance), (Vector2){ 550, 20 }, GetFontBaseSize(font), -2, ORANGE);
+                    DrawTextEx(font, FormatText("SCORE: %04i", score), (Vector2){ screenWidth - 300, 20 }, font.size, -2, ORANGE);
+                    DrawTextEx(font, FormatText("DISTANCE: %04i", (int)distance), (Vector2){ 550, 20 }, font.size, -2, ORANGE);
                     
                     if (gameraMode)
                     {
@@ -439,15 +441,15 @@ int main()
                     // Draw a transparent black rectangle that covers all screen
                     DrawRectangle(0, 0, screenWidth, screenHeight, Fade(BLACK, 0.4f));
                 
-                    DrawTextEx(font, "GAME OVER", (Vector2){ 300, 160 }, GetFontBaseSize(font)*3, -2, MAROON);
+                    DrawTextEx(font, "GAME OVER", (Vector2){ 300, 160 }, font.size*3, -2, MAROON);
                     
-                    DrawTextEx(font, FormatText("SCORE: %04i", score), (Vector2){ 680, 350 }, GetFontBaseSize(font), -2, GOLD);
-                    DrawTextEx(font, FormatText("DISTANCE: %04i", (int)distance), (Vector2){ 290, 350 }, GetFontBaseSize(font), -2, GOLD);
-                    DrawTextEx(font, FormatText("HISCORE: %04i", hiscore), (Vector2){ 665, 400 }, GetFontBaseSize(font), -2, ORANGE);
-                    DrawTextEx(font, FormatText("HIDISTANCE: %04i", (int)hidistance), (Vector2){ 270, 400 }, GetFontBaseSize(font), -2, ORANGE);
+                    DrawTextEx(font, FormatText("SCORE: %04i", score), (Vector2){ 680, 350 }, font.size, -2, GOLD);
+                    DrawTextEx(font, FormatText("DISTANCE: %04i", (int)distance), (Vector2){ 290, 350 }, font.size, -2, GOLD);
+                    DrawTextEx(font, FormatText("HISCORE: %04i", hiscore), (Vector2){ 665, 400 }, font.size, -2, ORANGE);
+                    DrawTextEx(font, FormatText("HIDISTANCE: %04i", (int)hidistance), (Vector2){ 270, 400 }, font.size, -2, ORANGE);
                     
                     // Draw blinking text
-                    if ((framesCounter/30) % 2) DrawTextEx(font, "PRESS ENTER to REPLAY", (Vector2){ screenWidth/2 - 250, 520 }, GetFontBaseSize(font), -2, LIGHTGRAY);
+                    if ((framesCounter/30) % 2) DrawTextEx(font, "PRESS ENTER to REPLAY", (Vector2){ screenWidth/2 - 250, 520 }, font.size, -2, LIGHTGRAY);
                     
                 } break;
                 default: break;
diff --git a/games/drturtle/drturtle_final_web.c b/games/drturtle/drturtle_final_web.c
new file mode 100644
index 00000000..25f4074b
--- /dev/null
+++ b/games/drturtle/drturtle_final_web.c
@@ -0,0 +1,541 @@
+/*******************************************************************************************
+*
+*   raylib game - Dr. Turtle & Mr. Gamera
+*
+*   Welcome to raylib!
+*
+*   To test examples, just press F6 and execute raylib_compile_execute script
+*   Note that compiled executable is placed in the same folder as .c file
+*
+*   You can find all basic examples on C:\raylib\raylib\examples folder or
+*   raylib official webpage: www.raylib.com
+*
+*   Enjoy using raylib. :)
+*
+*   This game has been created using raylib 1.1 (www.raylib.com)
+*   raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details)
+*
+*   Copyright (c) 2014 Ramon Santamaria (Ray San - raysan@raysanweb.com)
+*
+********************************************************************************************/
+
+#include "raylib.h"
+#include <math.h>        // Used for sinf()
+
+#if defined(PLATFORM_WEB)
+    #include <emscripten/emscripten.h>
+#endif
+
+#define MAX_ENEMIES 10
+
+typedef enum { TITLE = 0, GAMEPLAY, ENDING } GameScreen;
+
+//----------------------------------------------------------------------------------
+// Global Variables Definition
+//----------------------------------------------------------------------------------
+const int screenWidth = 1280;
+const int screenHeight = 720;
+    
+Texture2D sky;
+Texture2D mountains;
+Texture2D sea;
+Texture2D title;
+Texture2D turtle;
+Texture2D gamera;
+Texture2D shark;
+Texture2D orca;
+Texture2D swhale;
+Texture2D fish;
+Texture2D gframe;
+
+SpriteFont font;
+
+Sound eat;
+Sound die;
+Sound growl;
+
+// Define scrolling variables
+int backScrolling = 0;
+int seaScrolling = 0;
+
+// Define current screen
+GameScreen currentScreen = 0;
+
+// Define player variables
+int playerRail = 1;
+Rectangle playerBounds;
+bool gameraMode = false;
+
+// Define enemies variables
+Rectangle enemyBounds[MAX_ENEMIES];
+int enemyRail[MAX_ENEMIES];
+int enemyType[MAX_ENEMIES];
+bool enemyActive[MAX_ENEMIES];
+float enemySpeed = 10;
+    
+// Define additional game variables
+int score = 0;
+float distance = 0.0f;
+int hiscore = 0;
+float hidistance = 0.0f;
+int foodBar = 0;
+int framesCounter = 0;
+
+unsigned char blue = 200;
+float timeCounter = 0;
+    
+//----------------------------------------------------------------------------------
+// Module Functions Declaration
+//----------------------------------------------------------------------------------
+void UpdateDrawFrame(void);     // Update and Draw one frame
+
+//----------------------------------------------------------------------------------
+// Main Enry Point
+//----------------------------------------------------------------------------------
+int main()
+{
+    // Initialization
+    //--------------------------------------------------------------------------------------
+    
+    // Init window
+    InitWindow(screenWidth, screenHeight, "Dr. Turtle & Mr. GAMERA");
+    
+    // Initialize audio device
+    InitAudioDevice();      
+    
+    // Load game resources: textures
+    sky = LoadTexture("resources/sky.png");
+    mountains = LoadTexture("resources/mountains.png");
+    sea = LoadTexture("resources/sea.png");
+    title = LoadTexture("resources/title.png");
+    turtle = LoadTexture("resources/turtle.png");
+    gamera = LoadTexture("resources/gamera.png");
+    shark = LoadTexture("resources/shark.png");
+    orca = LoadTexture("resources/orca.png");
+    swhale = LoadTexture("resources/swhale.png");
+    fish = LoadTexture("resources/fish.png");
+    gframe = LoadTexture("resources/gframe.png");
+    
+    // Load game resources: fonts
+    font = LoadSpriteFont("resources/komika.png");
+    
+    // Load game resources: sounds
+    eat = LoadSound("resources/eat.wav");
+    die = LoadSound("resources/die.wav");
+    growl = LoadSound("resources/gamera.wav");
+    
+    // Start playing streaming music
+    PlayMusicStream("resources/speeding.ogg");
+    
+    playerBounds = (Rectangle){ 30 + 14, playerRail*120 + 90 + 14, 100, 100 };
+    
+    // Init enemies variables
+    for (int i = 0; i < MAX_ENEMIES; i++)
+    {
+        // Define enemy type (all same probability)
+        //enemyType[i] = GetRandomValue(0, 3);
+    
+        // Probability system for enemies type
+        int enemyProb = GetRandomValue(0, 100);
+        
+        if (enemyProb < 30) enemyType[i] = 0;
+        else if (enemyProb < 60) enemyType[i] = 1;
+        else if (enemyProb < 90) enemyType[i] = 2;
+        else enemyType[i] = 3;
+
+        // define enemy rail
+        enemyRail[i] = GetRandomValue(0, 4);
+
+        // Make sure not two consecutive enemies in the same row
+        if (i > 0) while (enemyRail[i] == enemyRail[i - 1]) enemyRail[i] = GetRandomValue(0, 4);
+        
+        enemyBounds[i] = (Rectangle){ screenWidth + 14, 120*enemyRail[i] + 90 + 14, 100, 100 };
+        enemyActive[i] = false;
+    }
+    
+#if defined(PLATFORM_WEB)
+    emscripten_set_main_loop(UpdateDrawFrame, 0, 1);
+#else
+    SetTargetFPS(60);   // Set our game to run at 60 frames-per-second
+    //--------------------------------------------------------------------------------------
+    
+    // Main game loop
+    while (!WindowShouldClose())    // Detect window close button or ESC key
+    {
+        UpdateDrawFrame();
+    }
+#endif
+
+    // De-Initialization
+    //--------------------------------------------------------------------------------------
+    
+    // Unload textures
+    UnloadTexture(sky);
+    UnloadTexture(mountains);
+    UnloadTexture(sea);
+    UnloadTexture(gframe);
+    UnloadTexture(title);
+    UnloadTexture(turtle);
+    UnloadTexture(shark);
+    UnloadTexture(orca);
+    UnloadTexture(swhale);
+    UnloadTexture(fish);
+    UnloadTexture(gamera);
+    
+    // Unload font texture
+    UnloadSpriteFont(font);
+    
+    // Unload sounds
+    UnloadSound(eat);
+    UnloadSound(die);
+    UnloadSound(growl);
+    
+    StopMusicStream();      // Stop music
+    CloseAudioDevice();     // Close audio device
+    
+    CloseWindow();          // Close window and OpenGL context
+    //--------------------------------------------------------------------------------------
+    
+    return 0;
+}
+
+//----------------------------------------------------------------------------------
+// Module Functions Definition
+//----------------------------------------------------------------------------------
+void UpdateDrawFrame(void)
+{
+    // Update
+    //----------------------------------------------------------------------------------
+    UpdateMusicStream();
+    
+    framesCounter++;
+    
+    // Sea color tint effect
+    blue = 210 + 25 * sinf(timeCounter);
+    timeCounter += 0.01;
+
+    // Game screens management
+    switch (currentScreen)
+    {
+        case TITLE:
+        {
+            // Sea scrolling
+            seaScrolling -= 2;
+            if (seaScrolling <= -screenWidth) seaScrolling = 0; 
+        
+            // Press enter to change to gameplay screen
+            if (IsKeyPressed(KEY_ENTER))
+            {
+                currentScreen = GAMEPLAY;
+                framesCounter = 0;
+            }
+            
+        } break;
+        case GAMEPLAY:
+        {
+            // Background scrolling logic
+            backScrolling--;
+            if (backScrolling <= -screenWidth) backScrolling = 0; 
+            
+            // Sea scrolling logic
+            seaScrolling -= (enemySpeed - 2);
+            if (seaScrolling <= -screenWidth) seaScrolling = 0; 
+        
+            // Player movement logic
+            if (IsKeyPressed(KEY_DOWN)) playerRail++;
+            else if (IsKeyPressed(KEY_UP)) playerRail--;
+            
+            // Check player not out of rails
+            if (playerRail > 4) playerRail = 4;
+            else if (playerRail < 0) playerRail = 0;
+        
+            // Update player bounds
+            playerBounds = (Rectangle){ 30 + 14, playerRail*120 + 90 + 14, 100, 100 };
+            
+            // Enemies activation logic (every 40 frames)        
+            if (framesCounter > 40)
+            {
+                for (int i = 0; i < MAX_ENEMIES; i++)
+                {
+                    if (enemyActive[i] == false)
+                    {
+                        enemyActive[i] = true;
+                        i = MAX_ENEMIES;
+                    }
+                }
+                
+                framesCounter = 0;
+            }
+            
+            // Enemies logic
+            for (int i = 0; i < MAX_ENEMIES; i++)
+            {
+                if (enemyActive[i])
+                {
+                    enemyBounds[i].x -= enemySpeed;
+                }
+                
+                // Check enemies out of screen
+                if (enemyBounds[i].x <= 0 - 128)
+                {
+                    enemyActive[i] = false;
+                    enemyType[i] = GetRandomValue(0, 3);
+                    enemyRail[i] = GetRandomValue(0, 4);
+                    
+                    // Make sure not two consecutive enemies in the same row
+                    if (i > 0) while (enemyRail[i] == enemyRail[i - 1]) enemyRail[i] = GetRandomValue(0, 4);
+                    
+                    enemyBounds[i] = (Rectangle){ screenWidth + 14, 120*enemyRail[i] + 90 + 14, 100, 100 };
+                }
+            }
+            
+            if (!gameraMode) enemySpeed += 0.005;
+            
+            // Check collision player vs enemies
+            for (int i = 0; i < MAX_ENEMIES; i++)
+            {
+                if (enemyActive[i])
+                {
+                    if (CheckCollisionRecs(playerBounds, enemyBounds[i]))
+                    {                       
+                        if (enemyType[i] < 3)   // Bad enemies
+                        {
+                            if (gameraMode)
+                            {
+                                if (enemyType[i] == 0) score += 50;
+                                else if (enemyType[i] == 1) score += 150;
+                                else if (enemyType[i] == 2) score += 300;
+                                
+                                foodBar += 15;
+                            
+                                enemyActive[i] = false;
+                                
+                                // After enemy deactivation, reset enemy parameters to be reused
+                                enemyType[i] = GetRandomValue(0, 3);
+                                enemyRail[i] = GetRandomValue(0, 4);
+                                
+                                // Make sure not two consecutive enemies in the same row
+                                if (i > 0) while (enemyRail[i] == enemyRail[i - 1]) enemyRail[i] = GetRandomValue(0, 4);
+                                
+                                enemyBounds[i] = (Rectangle){ screenWidth + 14, 120*enemyRail[i] + 90 + 14, 100, 100 };
+                                
+                                PlaySound(eat);
+                            }
+                            else
+                            {
+                                // Player die logic
+                                PlaySound(die);
+                            
+                                currentScreen = ENDING;
+                                framesCounter = 0;
+                                
+                                // Save hiscore and hidistance for next game
+                                if (score > hiscore) hiscore = score;
+                                if (distance > hidistance) hidistance = distance;
+                            }
+                        }
+                        else    // Sweet fish
+                        {
+                            enemyActive[i] = false;
+                            enemyType[i] = GetRandomValue(0, 3);
+                            enemyRail[i] = GetRandomValue(0, 4);
+                            
+                            // Make sure not two consecutive enemies in the same row
+                            if (i > 0) while (enemyRail[i] == enemyRail[i - 1]) enemyRail[i] = GetRandomValue(0, 4);
+                            
+                            enemyBounds[i] = (Rectangle){ screenWidth + 14, 120*enemyRail[i] + 90 + 14, 100, 100 };
+                            
+                            if (!gameraMode) foodBar += 80;
+                            else foodBar += 25;
+                            
+                            score += 10;
+                            
+                            if (foodBar == 400)
+                            {
+                                gameraMode = true;
+                                
+                                PlaySound(growl);
+                            }
+                            
+                            PlaySound(eat);
+                        }
+                    }
+                }
+            }
+            
+            // Gamera mode logic
+            if (gameraMode)
+            {
+                foodBar--;
+                
+                if (foodBar <= 0) 
+                {
+                    gameraMode = false;
+                    enemySpeed -= 2;
+                    if (enemySpeed < 10) enemySpeed = 10;
+                }
+            }
+    
+            // Update distance counter
+            distance += 0.5f;
+        
+        } break;
+        case ENDING:
+        {
+            // Press enter to play again
+            if (IsKeyPressed(KEY_ENTER))
+            {
+                currentScreen = GAMEPLAY;
+                
+                // Reset player
+                playerRail = 1;
+                playerBounds = (Rectangle){ 30 + 14, playerRail*120 + 90 + 14, 100, 100 };
+                gameraMode = false;
+                
+                // Reset enemies data
+                for (int i = 0; i < MAX_ENEMIES; i++)
+                {
+                    int enemyProb = GetRandomValue(0, 100);
+                    
+                    if (enemyProb < 30) enemyType[i] = 0;
+                    else if (enemyProb < 60) enemyType[i] = 1;
+                    else if (enemyProb < 90) enemyType[i] = 2;
+                    else enemyType[i] = 3;
+                    
+                    //enemyType[i] = GetRandomValue(0, 3);
+                    enemyRail[i] = GetRandomValue(0, 4);
+
+                    // Make sure not two consecutive enemies in the same row
+                    if (i > 0) while (enemyRail[i] == enemyRail[i - 1]) enemyRail[i] = GetRandomValue(0, 4);
+                    
+                    enemyBounds[i] = (Rectangle){ screenWidth + 14, 120*enemyRail[i] + 90 + 14, 100, 100 };
+                    enemyActive[i] = false;
+                }
+                
+                enemySpeed = 10;
+                
+                // Reset game variables
+                score = 0;
+                distance = 0.0;
+                foodBar = 0;
+                framesCounter = 0;
+            }
+  
+        } break;
+        default: break;
+    }
+    //----------------------------------------------------------------------------------
+    
+    // Draw
+    //----------------------------------------------------------------------------------
+    BeginDrawing();
+    
+        ClearBackground(RAYWHITE);
+        
+        // Draw background (common to all screens)
+        DrawTexture(sky, 0, 0, WHITE);
+        
+        DrawTexture(mountains, backScrolling, 0, WHITE);
+        DrawTexture(mountains, screenWidth + backScrolling, 0, WHITE);
+        
+        if (!gameraMode)
+        {
+            DrawTexture(sea, seaScrolling, 0, (Color){ 16, 189, blue, 255});
+            DrawTexture(sea, screenWidth + seaScrolling, 0, (Color){ 16, 189, blue, 255});
+        }
+        else
+        {
+            DrawTexture(sea, seaScrolling, 0, (Color){ 255, 113, 66, 255});
+            DrawTexture(sea, screenWidth + seaScrolling, 0, (Color){ 255, 113, 66, 255});
+        }
+        
+        switch (currentScreen)
+        {
+            case TITLE:
+            {
+                // Draw title
+                DrawTexture(title, screenWidth/2 - title.width/2, screenHeight/2 - title.height/2 - 80, WHITE);
+                
+                // Draw blinking text
+                if ((framesCounter/30) % 2) DrawTextEx(font, "PRESS ENTER", (Vector2){ screenWidth/2 - 150, 480 }, font.size, 1, WHITE);
+            
+            } break;
+            case GAMEPLAY:
+            {
+                // Draw water lines
+                for (int i = 0; i < 5; i++) DrawRectangle(0, i*120 + 120, screenWidth, 110, Fade(SKYBLUE, 0.1f));
+                
+                // Draw player
+                if (!gameraMode) DrawTexture(turtle, playerBounds.x - 14, playerBounds.y - 14, WHITE);
+                else DrawTexture(gamera, playerBounds.x - 64, playerBounds.y - 64, WHITE);
+                
+                // Draw player bounding box
+                //if (!gameraMode) DrawRectangleRec(playerBounds, Fade(GREEN, 0.4f));
+                //else DrawRectangleRec(playerBounds, Fade(ORANGE, 0.4f));
+                
+                // Draw enemies
+                for (int i = 0; i < MAX_ENEMIES; i++)
+                {
+                    if (enemyActive[i]) 
+                    {
+                        // Draw enemies
+                        switch(enemyType[i])
+                        {
+                            case 0: DrawTexture(shark, enemyBounds[i].x - 14, enemyBounds[i].y - 14, WHITE); break;
+                            case 1: DrawTexture(orca, enemyBounds[i].x - 14, enemyBounds[i].y - 14, WHITE); break;
+                            case 2: DrawTexture(swhale, enemyBounds[i].x - 14, enemyBounds[i].y - 14, WHITE); break;
+                            case 3: DrawTexture(fish, enemyBounds[i].x - 14, enemyBounds[i].y - 14, WHITE); break;
+                            default: break;
+                        }
+                        
+                        // Draw enemies bounding boxes
+                        /*
+                        switch(enemyType[i])
+                        {
+                            case 0: DrawRectangleRec(enemyBounds[i], Fade(RED, 0.5f)); break;
+                            case 1: DrawRectangleRec(enemyBounds[i], Fade(RED, 0.5f)); break;
+                            case 2: DrawRectangleRec(enemyBounds[i], Fade(RED, 0.5f)); break;
+                            case 3: DrawRectangleRec(enemyBounds[i], Fade(GREEN, 0.5f)); break;
+                            default: break;
+                        }
+                        */
+                    }
+                }
+                
+                // Draw gameplay interface
+                DrawRectangle(20, 20, 400, 40, Fade(GRAY, 0.4f));
+                DrawRectangle(20, 20, foodBar, 40, ORANGE);
+                DrawRectangleLines(20, 20, 400, 40, BLACK);
+                
+                DrawTextEx(font, FormatText("SCORE: %04i", score), (Vector2){ screenWidth - 300, 20 }, font.size, -2, ORANGE);
+                DrawTextEx(font, FormatText("DISTANCE: %04i", (int)distance), (Vector2){ 550, 20 }, font.size, -2, ORANGE);
+                
+                if (gameraMode)
+                {
+                    DrawText("GAMERA MODE", 60, 22, 40, GRAY);
+                    DrawTexture(gframe, 0, 0, Fade(WHITE, 0.5f));
+                }
+        
+            } break;
+            case ENDING:
+            {
+                // Draw a transparent black rectangle that covers all screen
+                DrawRectangle(0, 0, screenWidth, screenHeight, Fade(BLACK, 0.4f));
+            
+                DrawTextEx(font, "GAME OVER", (Vector2){ 300, 160 }, font.size*3, -2, MAROON);
+                
+                DrawTextEx(font, FormatText("SCORE: %04i", score), (Vector2){ 680, 350 }, font.size, -2, GOLD);
+                DrawTextEx(font, FormatText("DISTANCE: %04i", (int)distance), (Vector2){ 290, 350 }, font.size, -2, GOLD);
+                DrawTextEx(font, FormatText("HISCORE: %04i", hiscore), (Vector2){ 665, 400 }, font.size, -2, ORANGE);
+                DrawTextEx(font, FormatText("HIDISTANCE: %04i", (int)hidistance), (Vector2){ 270, 400 }, font.size, -2, ORANGE);
+                
+                // Draw blinking text
+                if ((framesCounter/30) % 2) DrawTextEx(font, "PRESS ENTER to REPLAY", (Vector2){ screenWidth/2 - 250, 520 }, font.size, -2, LIGHTGRAY);
+                
+            } break;
+            default: break;
+        }
+
+    EndDrawing();
+    //----------------------------------------------------------------------------------
+}
+\ No newline at end of file
diff --git a/games/drturtle/makefile b/games/drturtle/makefile
new file mode 100644
index 00000000..f9efd3e8
--- /dev/null
+++ b/games/drturtle/makefile
@@ -0,0 +1,186 @@
+#**************************************************************************************************
+#
+#   raylib - makefile to compile Dr.Turtle game
+#
+#   Copyright (c) 2014 Ramon Santamaria (Ray San - raysan@raysanweb.com)
+#    
+#   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.
+#
+#   Permission is granted to anyone to use this software for any purpose, including commercial 
+#   applications, and to alter it and redistribute it freely, subject to the following restrictions:
+#
+#     1. The origin of this software must not be misrepresented; you must not claim that you 
+#     wrote the original software. If you use this software in a product, an acknowledgment 
+#     in the product documentation would be appreciated but is not required.
+#
+#     2. Altered source versions must be plainly marked as such, and must not be misrepresented
+#     as being the original software.
+#
+#     3. This notice may not be removed or altered from any source distribution.
+#
+#**************************************************************************************************
+
+# define raylib platform if not defined (by default, compile for RPI)
+# Other possible platform: PLATFORM_DESKTOP
+PLATFORM ?= PLATFORM_DESKTOP
+
+# 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)
+        PLATFORM_OS=WINDOWS
+        LIBPATH=win32
+    else
+        UNAMEOS:=$(shell uname)
+        ifeq ($(UNAMEOS),Linux)
+            PLATFORM_OS=LINUX
+            LIBPATH=linux
+        else
+        ifeq ($(UNAMEOS),Darwin)
+            PLATFORM_OS=OSX
+            LIBPATH=osx
+        endif
+        endif
+    endif
+endif
+
+# define compiler: gcc for C program, define as g++ for C++
+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
+#  -Wall       turns on most, but not all, compiler warnings
+#  -std=c99    use standard C from 1999 revision
+ifeq ($(PLATFORM),PLATFORM_RPI)
+    CFLAGS = -O2 -Wall -std=gnu99 -fgnu89-inline
+else
+    CFLAGS = -O2 -Wall -std=c99
+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
+    #-s ASSERTIONS=1 --preload-file resources
+    #-s ALLOW_MEMORY_GROWTH=1   # to allow memory resizing
+    #-s TOTAL_MEMORY=16777216   # to specify heap memory size (default = 16MB)
+endif
+
+# define any directories containing required header files
+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
+    # 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
+
+# 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 ($(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 ($(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
+    else
+        # libraries for Windows desktop compiling
+        # NOTE: GLFW3 and OpenAL Soft libraries should be installed
+        LIBS = -lraylib -lglfw3 -lglew32 -lopengl32 -lopenal32 -lgdi32
+    endif
+endif
+ifeq ($(PLATFORM),PLATFORM_RPI)
+    # libraries for Raspberry Pi compiling
+    # NOTE: OpenAL Soft library should be installed (libopenal1 package)
+    LIBS = -lraylib -lGLESv2 -lEGL -lpthread -lrt -lm -lbcm_host -lopenal
+endif
+ifeq ($(PLATFORM),PLATFORM_WEB)
+    LIBS = ../../src/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
+endif
+
+ifeq ($(PLATFORM),PLATFORM_WEB)
+    EXT = .html
+endif
+
+# define all screen object files required
+SCREENS = \
+
+# typing 'make' will invoke the first target entry in the file,
+# in this case, the 'default' target entry is advance_game
+default: drturtle
+
+# compile template - advance_game
+drturtle: drturtle_final_web.c $(SCREENS)
+	$(CC) -o $@$(EXT) $< $(SCREENS) $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS)
+
+# clean everything
+clean:
+ifeq ($(PLATFORM),PLATFORM_DESKTOP)
+    ifeq ($(PLATFORM_OS),OSX)
+		find . -type f -perm +ugo+x -delete
+		rm -f *.o
+    else
+    ifeq ($(PLATFORM_OS),LINUX)
+		find . -type f -executable -delete
+		rm -f *.o
+    else
+		del *.o *.exe
+    endif
+    endif
+endif
+ifeq ($(PLATFORM),PLATFORM_RPI)
+	find . -type f -executable -delete
+	rm -f *.o
+endif
+ifeq ($(PLATFORM),PLATFORM_WEB)
+	del *.o *.html *.js
+endif
+	@echo Cleaning done
+
+# instead of defining every module one by one, we can define a pattern
+# this pattern below will automatically compile every module defined on $(OBJS)
+#%.exe : %.c
+#	$(CC) -o $@ $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM)
diff --git a/games/samples/floppy.c b/games/floppy.c
index f48ea235..f48ea235 100644
--- a/games/samples/floppy.c
+++ b/games/floppy.c
diff --git a/games/samples/gold_fever.c b/games/gold_fever.c
index 5a435027..5a435027 100644
--- a/games/samples/gold_fever.c
+++ b/games/gold_fever.c
diff --git a/games/samples/gorilas.c b/games/gorilas.c
index 86fd3f5b..86fd3f5b 100644
--- a/games/samples/gorilas.c
+++ b/games/gorilas.c
diff --git a/games/just_do/makefile b/games/just_do/makefile
index 4c36b154..5cca9df5 100644
--- a/games/just_do/makefile
+++ b/games/just_do/makefile
@@ -72,7 +72,7 @@ else
     CFLAGS = -O2 -Wall -std=c99
 endif
 ifeq ($(PLATFORM),PLATFORM_WEB)
-    CFLAGS = -O1 -Wall -std=c99 -s USE_GLFW=3 
+    CFLAGS = -O1 -Wall -std=c99 -s USE_GLFW=3 --shell-file ../../templates/web_shell/shell.html
     #-s ASSERTIONS=1 --preload-file resources
     #-s ALLOW_MEMORY_GROWTH=1   # to allow memory resizing
     #-s TOTAL_MEMORY=16777216   # to specify heap memory size (default = 16MB)
diff --git a/games/light_my_ritual/makefile b/games/light_my_ritual/makefile
index b7e1bb58..84d7e994 100644
--- a/games/light_my_ritual/makefile
+++ b/games/light_my_ritual/makefile
@@ -2,7 +2,7 @@
 #
 #   raylib - Advance Game
 #
-#   makefile to compile advance game
+#   makefile to compile advance game for desktop platforms, Raspberry Pi and HTML5 (emscripten)
 #
 #   Copyright (c) 2014 Ramon Santamaria (Ray San - raysan@raysanweb.com)
 #    
@@ -71,7 +71,7 @@ else
     CFLAGS = -O2 -Wall -std=c99
 endif
 ifeq ($(PLATFORM),PLATFORM_WEB)
-    CFLAGS = -O1 -Wall -std=c99 -s USE_GLFW=3 --preload-file resources -s ALLOW_MEMORY_GROWTH=1
+    CFLAGS = -O1 -Wall -std=c99 -s USE_GLFW=3 --preload-file resources -s ALLOW_MEMORY_GROWTH=1 --shell-file ../../templates/web_shell/shell.html
     #-s ASSERTIONS=1 --preload-file resources
     #-s ALLOW_MEMORY_GROWTH=1   # to allow memory resizing
     #-s TOTAL_MEMORY=16777216   # to specify heap memory size (default = 16MB)
@@ -81,7 +81,7 @@ endif
 ifeq ($(PLATFORM),PLATFORM_RPI)
     INCLUDES = -I. -I../../src -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads
 else
-    INCLUDES = -I. -IC:/raylib/raylib/src -IC:/raylib/raylib/src
+    INCLUDES = -I. -I../../src
 # external libraries headers
 # GLFW3
     INCLUDES += -I../../external/glfw3/include
@@ -95,7 +95,7 @@ endif
 ifeq ($(PLATFORM),PLATFORM_RPI)
     LFLAGS = -L. -L../../src -L/opt/vc/lib
 else
-    LFLAGS = -L. -LC:/raylib/raylib/src -L../../../src
+    LFLAGS = -L. -L../../src
     # external libraries to link with
     # GLFW3
     LFLAGS += -L../../external/glfw3/lib/$(LIBPATH)
@@ -133,14 +133,14 @@ ifeq ($(PLATFORM),PLATFORM_RPI)
     LIBS = -lraylib -lGLESv2 -lEGL -lpthread -lrt -lm -lbcm_host -lopenal
 endif
 ifeq ($(PLATFORM),PLATFORM_WEB)
-    LIBS = C:/raylib/raylib/src/libraylib.bc
+    LIBS = ../../src/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 = C:/raylib/raylib/src/resources -Wl,--subsystem,windows
+    WINFLAGS = ../../src/resources -Wl,--subsystem,windows
 endif
 
 ifeq ($(PLATFORM),PLATFORM_WEB)
diff --git a/games/makefile b/games/makefile
new file mode 100644
index 00000000..2d992896
--- /dev/null
+++ b/games/makefile
@@ -0,0 +1,254 @@
+#**************************************************************************************************
+#
+#   raylib makefile for desktop platforms, Raspberry Pi and HTML5 (emscripten)
+#
+#   Copyright (c) 2015 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.
+#
+#   Permission is granted to anyone to use this software for any purpose, including commercial 
+#   applications, and to alter it and redistribute it freely, subject to the following restrictions:
+#
+#     1. The origin of this software must not be misrepresented; you must not claim that you 
+#     wrote the original software. If you use this software in a product, an acknowledgment 
+#     in the product documentation would be appreciated but is not required.
+#
+#     2. Altered source versions must be plainly marked as such, and must not be misrepresented
+#     as being the original software.
+#
+#     3. This notice may not be removed or altered from any source distribution.
+#
+#**************************************************************************************************
+
+# 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
+
+# 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)
+        PLATFORM_OS=WINDOWS
+        LIBPATH=win32
+    else
+        UNAMEOS:=$(shell uname)
+        ifeq ($(UNAMEOS),Linux)
+            PLATFORM_OS=LINUX
+            LIBPATH=linux
+        else
+        ifeq ($(UNAMEOS),Darwin)
+            PLATFORM_OS=OSX
+            LIBPATH=osx
+        endif
+        endif
+    endif
+endif
+
+# define compiler: gcc for C program, define as g++ for C++
+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
+#  -Wall       turns on most, but not all, compiler warnings
+#  -std=c99    use standard C from 1999 revision
+ifeq ($(PLATFORM),PLATFORM_RPI)
+    CFLAGS = -O2 -Wall -std=gnu99 -fgnu89-inline
+else
+    CFLAGS = -O2 -Wall -std=c99
+endif
+ifeq ($(PLATFORM),PLATFORM_WEB)
+    CFLAGS = -O1 -Wall -std=c99 -s USE_GLFW=3 --shell-file ../../templates/web_shell/shell.html
+    #-s ASSERTIONS=1            # to check for memory allocation errors (-O1 disables it)
+    #-s ALLOW_MEMORY_GROWTH=1   # to allow memory resizing
+    #-s TOTAL_MEMORY=16777216   # to specify heap memory size (default = 16MB)
+endif
+
+#CFLAGSEXTRA = -Wextra -Wmissing-prototypes -Wstrict-prototypes
+
+# define any directories containing required header files
+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 - Not required any more, replaced by GLAD
+    #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
+# 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
+
+# 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 ($(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 -lglfw3 -lGLEW -lGL -lopenal -lm -pthread
+	# on XWindow could require also below libraries, just uncomment
+	#LIBS += -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
+    else
+        # libraries for Windows desktop compiling
+        # NOTE: GLFW3 and OpenAL Soft libraries should be installed
+        LIBS = -lraylib -lglfw3 -lopengl32 -lopenal32 -lgdi32
+    endif
+    endif
+endif
+ifeq ($(PLATFORM),PLATFORM_RPI)
+    # libraries for Raspberry Pi compiling
+    # NOTE: OpenAL Soft library should be installed (libopenal1 package)
+    LIBS = -lraylib -lGLESv2 -lEGL -lpthread -lrt -lm -lbcm_host -lopenal
+endif
+ifeq ($(PLATFORM),PLATFORM_WEB)
+    # NOTE: Set the correct path to libraylib.bc
+    LIBS = ../src/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
+endif
+
+ifeq ($(PLATFORM),PLATFORM_WEB)
+    EXT = .html
+endif
+
+# define all object files required
+SAMPLES = \
+    arkanoid \
+    asteroids \
+    asteroids_survival \
+    floppy \
+    gold_fever \
+    gorilas \
+    missile_commander \
+    pang \
+    snake \
+    space_invaders \
+    tetris \
+    fix_dylib \
+
+
+# typing 'make' will invoke the first target entry in the file,
+# in this case, the 'default' target entry is raylib
+default: samples
+
+# compile all game samples
+samples: $(SAMPLES)
+
+# compile game sample - arkanoid
+arkanoid: arkanoid.c
+	$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS)
+    
+# compile game sample - steroids
+asteroids: asteroids.c
+	$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS)
+    
+# compile game sample - asteroids_survival
+asteroids_survival: asteroids_survival.c
+	$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS)
+
+# compile game sample - floppy
+floppy: floppy.c
+	$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS)
+    
+# compile game sample - gold_fever
+gold_fever: gold_fever.c
+	$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS)
+
+# compile game sample - gorilas
+gorilas: gorilas.c
+	$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS)
+
+# compile game sample - missile_commander
+missile_commander: missile_commander.c
+	$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS)
+    
+# compile game sample - pang
+pang: pang.c
+	$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS)
+
+# compile game sample - snake
+snake: snake.c
+	$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS)
+
+# compile game sample - space_invaders
+space_invaders: space_invaders.c
+	$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS)
+
+# compile game sample - tetris
+tetris: tetris.c
+	$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS)
+
+# fix dylib install path name for each executable (MAC)
+fix_dylib:
+ifeq ($(PLATFORM_OS),OSX)
+	find . -type f -perm +ugo+x -print0 | xargs -t -0 -R 1 -I file install_name_tool -change libglfw.3.0.dylib ../external/glfw3/lib/osx/libglfw.3.0.dylib file
+endif
+
+# clean everything
+clean:
+ifeq ($(PLATFORM),PLATFORM_DESKTOP)
+    ifeq ($(PLATFORM_OS),OSX)
+		find . -type f -perm +ugo+x -delete
+		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
+    else
+		del *.o *.exe
+    endif
+    endif
+endif
+ifeq ($(PLATFORM),PLATFORM_RPI)
+	find . -type f -executable -delete
+	rm -f *.o
+endif
+ifeq ($(PLATFORM),PLATFORM_WEB)
+	del *.o *.html *.js
+endif
+	@echo Cleaning done
+
+# instead of defining every module one by one, we can define a pattern
+# this pattern below will automatically compile every module defined on $(OBJS)
+#%.exe : %.c
+#	$(CC) -o $@ $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM)
diff --git a/games/samples/missile_commander.c b/games/missile_commander.c
index 6317c41a..6317c41a 100644
--- a/games/samples/missile_commander.c
+++ b/games/missile_commander.c
diff --git a/games/samples/pang.c b/games/pang.c
index fe1c3005..fe1c3005 100644
--- a/games/samples/pang.c
+++ b/games/pang.c
diff --git a/games/raylib_demo/makefile b/games/raylib_demo/makefile
index 3e2fe614..a4435bb0 100644
--- a/games/raylib_demo/makefile
+++ b/games/raylib_demo/makefile
@@ -2,7 +2,7 @@
 #
 #   raylib - Basic Game
 #
-#   makefile to compile basic game
+#   makefile to compile advance game for desktop platforms, Raspberry Pi and HTML5 (emscripten)
 #
 #   Copyright (c) 2014 Ramon Santamaria (Ray San - raysan@raysanweb.com)
 #    
@@ -23,31 +23,57 @@
 #
 #**************************************************************************************************
 
-# define raylib platform (by default, compile for RPI)
-# Other possible platform: PLATFORM_DESKTOP, PLATFORM_WEB, PLATFORM_RPI
-PLATFORM ?= PLATFORM_WEB
+# 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
+
+# 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)
+        PLATFORM_OS=WINDOWS
+        LIBPATH=win32
+    else
+        UNAMEOS:=$(shell uname)
+        ifeq ($(UNAMEOS),Linux)
+            PLATFORM_OS=LINUX
+            LIBPATH=linux
+        else
+        ifeq ($(UNAMEOS),Darwin)
+            PLATFORM_OS=OSX
+            LIBPATH=osx
+        endif
+        endif
+    endif
+endif
 
 # define compiler: gcc for C program, define as g++ for C++
 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
 #  -Wall       turns on most, but not all, compiler warnings
 #  -std=c99    use standard C from 1999 revision
 ifeq ($(PLATFORM),PLATFORM_RPI)
-    CFLAGS = -O1 -Wall -std=gnu99 -fgnu89-inline
+    CFLAGS = -O2 -Wall -std=gnu99 -fgnu89-inline
 else
-    CFLAGS = -O1 -Wall -std=c99
+    CFLAGS = -O2 -Wall -std=c99
 endif
-
 ifeq ($(PLATFORM),PLATFORM_WEB)
-    CFLAGS = -O1 -Wall -std=c99 -s USE_GLFW=3 -s ASSERTIONS=1 --preload-file resources
+    CFLAGS = -O1 -Wall -std=c99 -s USE_GLFW=3 --preload-file resources --shell-file ../../templates/web_shell/shell.html
+    #-s ASSERTIONS=1            # to check for memory allocation errors (-O1 disables it)
     #-s ALLOW_MEMORY_GROWTH=1   # to allow memory resizing
     #-s TOTAL_MEMORY=16777216   # to specify heap memory size (default = 16MB)
 endif
@@ -59,33 +85,66 @@ 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 - Not required any more, replaced by GLAD
+    #INCLUDES += -I../external/glew/include
+# OpenAL Soft
+    INCLUDES += -I../../external/openal_soft/include
 endif
 
 # define library paths containing required libs
-ifeq ($(PLATFORM),PLATFORM_WEB)
-    LFLAGS = -L.
-else
+ifeq ($(PLATFORM),PLATFORM_RPI)
     LFLAGS = -L. -L../../src -L/opt/vc/lib
+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
 
 # 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 ($(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 -lglfw3 -lGLEW -lGL -lopenal -lm -pthread
+        # on XWindow could require also below libraries, just uncomment
+        #LIBS += -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
+    else
+        # libraries for Windows desktop compiling
+        # NOTE: GLFW3 and OpenAL Soft libraries should be installed
+        LIBS = -lraylib -lglfw3 -lopengl32 -lopenal32 -lgdi32
+    endif
+    endif
+endif
 ifeq ($(PLATFORM),PLATFORM_RPI)
     # libraries for Raspberry Pi compiling
     # NOTE: OpenAL Soft library should be installed (libopenal1 package)
     LIBS = -lraylib -lGLESv2 -lEGL -lpthread -lrt -lm -lbcm_host -lopenal
-else
-    # libraries for Windows desktop compiling
-    # NOTE: GLFW3 and OpenAL Soft libraries should be installed
-    LIBS = -lraylib -lglfw3 -lglew32 -lopengl32 -lopenal32 -lgdi32
 endif
-
 ifeq ($(PLATFORM),PLATFORM_WEB)
+    # NOTE: Set the correct path to libraylib.bc
     LIBS = ../../src/libraylib.bc
 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
@@ -99,21 +158,30 @@ endif
 # in this case, the 'default' target entry is qidv_raylib
 default: raylib_demo
 
-# compile qidv_raylib
+# compile raylib demo
 raylib_demo: raylib_demo.c
 	$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS)
 
 # clean everything
 clean:
+ifeq ($(PLATFORM),PLATFORM_DESKTOP)
+    ifeq ($(PLATFORM_OS),OSX)
+		find . -type f -perm +ugo+x -delete
+		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
+    else
+		del *.o *.exe
+    endif
+    endif
+endif
 ifeq ($(PLATFORM),PLATFORM_RPI)
+	find . -type f -executable -delete
 	rm -f *.o
-#	find . -executable -delete
-else
-ifeq ($(PLATFORM),PLATFORM_WEB)
-	del *.html *.js
-else
-	del *.o *.exe
 endif
+ifeq ($(PLATFORM),PLATFORM_WEB)
+	del *.o *.html *.js
 endif
 	@echo Cleaning done
 
diff --git a/games/raylib_demo/raylib_demo.c b/games/raylib_demo/raylib_demo.c
index 5bbccbe8..7f6f291a 100644
--- a/games/raylib_demo/raylib_demo.c
+++ b/games/raylib_demo/raylib_demo.c
@@ -1,10 +1,8 @@
 /*******************************************************************************************
 *
-*   raylib - Talk: QIDV raylib (Learn Videogames Programming)
+*   raylib - Features demo 01 (Learn Videogames Programming)
 *
-*   Aprende a Programar Videojuegos con raylib
-*
-*   This talk has been created using raylib v1.2 (www.raylib.com)
+*   This show has been created using raylib v1.4 (www.raylib.com)
 *   raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details)
 *
 *   Copyright (c) 2014 Ramon Santamaria (Ray San - raysan@raysanweb.com)
@@ -703,11 +701,11 @@ void UpdateDrawOneFrame(void)
                     {
                         DrawText("This module give you functions to:", 48, 200, 10, GetColor(0x5c5a5aff));
                     
-                        DrawTextEx(fontRomulus, "Open-Close Window", (Vector2){ 48, 230 }, GetFontBaseSize(fontRomulus)*2, 4, GetColor(0x5c5a5aff));
-                        DrawTextEx(fontRomulus, "Manage Drawing Area", (Vector2){ 48, 260 }, GetFontBaseSize(fontRomulus)*2, 4, GetColor(0x5c5a5aff));
-                        DrawTextEx(fontRomulus, "Manage Inputs", (Vector2){ 48, 290 }, GetFontBaseSize(fontRomulus)*2, 4, GetColor(0x5c5a5aff));
-                        DrawTextEx(fontRomulus, "Manage Timming", (Vector2){ 48, 320 }, GetFontBaseSize(fontRomulus)*2, 4, GetColor(0x5c5a5aff));
-                        DrawTextEx(fontRomulus, "Auxiliar Functions", (Vector2){ 48, 350 }, GetFontBaseSize(fontRomulus)*2, 4, GetColor(0x5c5a5aff));
+                        DrawTextEx(fontRomulus, "Open-Close Window", (Vector2){ 48, 230 }, fontRomulus.size*2, 4, GetColor(0x5c5a5aff));
+                        DrawTextEx(fontRomulus, "Manage Drawing Area", (Vector2){ 48, 260 }, fontRomulus.size*2, 4, GetColor(0x5c5a5aff));
+                        DrawTextEx(fontRomulus, "Manage Inputs", (Vector2){ 48, 290 }, fontRomulus.size*2, 4, GetColor(0x5c5a5aff));
+                        DrawTextEx(fontRomulus, "Manage Timming", (Vector2){ 48, 320 }, fontRomulus.size*2, 4, GetColor(0x5c5a5aff));
+                        DrawTextEx(fontRomulus, "Auxiliar Functions", (Vector2){ 48, 350 }, fontRomulus.size*2, 4, GetColor(0x5c5a5aff));
 
                         switch (coreWindow)
                         {
@@ -733,16 +731,16 @@ void UpdateDrawOneFrame(void)
                         
                         if (framesCounter > 140)
                         {
-                            DrawTextEx(fontMecha, "MOVE ME", (Vector2){ ballPosition.x - 26, ballPosition.y - 20 }, GetFontBaseSize(fontMecha), 2, BLACK);
-                            DrawTextEx(fontMecha, "[ W A S D ]", (Vector2){ ballPosition.x - 36, ballPosition.y }, GetFontBaseSize(fontMecha), 2, BLACK);
+                            DrawTextEx(fontMecha, "MOVE ME", (Vector2){ ballPosition.x - 26, ballPosition.y - 20 }, fontMecha.size, 2, BLACK);
+                            DrawTextEx(fontMecha, "[ W A S D ]", (Vector2){ ballPosition.x - 36, ballPosition.y }, fontMecha.size, 2, BLACK);
                         }
                     } break;
                     case SHAPES:
                     {
                         DrawText("This module give you functions to:", 48, 200, 10, GetColor(0xcd5757ff));
                     
-                        DrawTextEx(fontRomulus, "Draw Basic Shapes", (Vector2){ 48, 230 }, GetFontBaseSize(fontRomulus)*2, 4, GetColor(0xcd5757ff));
-                        DrawTextEx(fontRomulus, "Basic Collision Detection", (Vector2){ 48, 260 }, GetFontBaseSize(fontRomulus)*2, 4, GetColor(0xcd5757ff));
+                        DrawTextEx(fontRomulus, "Draw Basic Shapes", (Vector2){ 48, 230 }, fontRomulus.size*2, 4, GetColor(0xcd5757ff));
+                        DrawTextEx(fontRomulus, "Basic Collision Detection", (Vector2){ 48, 260 }, fontRomulus.size*2, 4, GetColor(0xcd5757ff));
 
                         DrawCircle(screenWidth/4, 120 + 240, 35, DARKBLUE);
                         DrawCircleGradient(screenWidth/4, 220 + 240, 60, GREEN, SKYBLUE);
@@ -763,8 +761,8 @@ void UpdateDrawOneFrame(void)
                     {
                         DrawText("This module give you functions to:", 48, 200, 10, GetColor(0x60815aff));
                     
-                        DrawTextEx(fontRomulus, "Load Images and Textures", (Vector2){ 48, 230 }, GetFontBaseSize(fontRomulus)*2, 4, GetColor(0x60815aff));
-                        DrawTextEx(fontRomulus, "Draw Textures", (Vector2){ 48, 260 }, GetFontBaseSize(fontRomulus)*2, 4, GetColor(0x60815aff));
+                        DrawTextEx(fontRomulus, "Load Images and Textures", (Vector2){ 48, 230 }, fontRomulus.size*2, 4, GetColor(0x60815aff));
+                        DrawTextEx(fontRomulus, "Draw Textures", (Vector2){ 48, 260 }, fontRomulus.size*2, 4, GetColor(0x60815aff));
 
                         DrawRectangle(138, 348, 260, 260, GRAY);
                         DrawTexturePro(lena, (Rectangle){ 0, 0, lena.width, lena.height }, (Rectangle){ 140 + 128, 350 + 128, lena.width/2*scaleFactor, lena.height/2*scaleFactor }, (Vector2){ lena.width/4*scaleFactor, lena.height/4*scaleFactor }, 0.0f, WHITE);
@@ -780,21 +778,21 @@ void UpdateDrawOneFrame(void)
                     {
                         DrawText("This module give you functions to:", 48, 200, 10, GetColor(0x377764ff));
                     
-                        DrawTextEx(fontRomulus, "Load SpriteFonts", (Vector2){ 48, 230 }, GetFontBaseSize(fontRomulus)*2, 4, GetColor(0x377764ff));
-                        DrawTextEx(fontRomulus, "Draw Text", (Vector2){ 48, 260 }, GetFontBaseSize(fontRomulus)*2, 4, GetColor(0x377764ff));
-                        DrawTextEx(fontRomulus, "Text Formatting", (Vector2){ 48, 290 }, GetFontBaseSize(fontRomulus)*2, 4, GetColor(0x377764ff));
+                        DrawTextEx(fontRomulus, "Load SpriteFonts", (Vector2){ 48, 230 }, fontRomulus.size*2, 4, GetColor(0x377764ff));
+                        DrawTextEx(fontRomulus, "Draw Text", (Vector2){ 48, 260 }, fontRomulus.size*2, 4, GetColor(0x377764ff));
+                        DrawTextEx(fontRomulus, "Text Formatting", (Vector2){ 48, 290 }, fontRomulus.size*2, 4, GetColor(0x377764ff));
 
                         DrawTexture(texAlagard, 60, 360, WHITE);
 
-                        DrawTextEx(fontMechaC, msg1, (Vector2){ 540 + 168, 210 }, GetFontBaseSize(fontMechaC), -3, WHITE);
-                        DrawTextEx(fontAlagardC, msg2, (Vector2){ 460 + 140, 260 }, GetFontBaseSize(fontAlagardC), -2, WHITE);
-                        DrawTextEx(fontJupiterC, msg3, (Vector2){ 640 + 70, 300 }, GetFontBaseSize(fontJupiterC), 2, WHITE);
+                        DrawTextEx(fontMechaC, msg1, (Vector2){ 540 + 168, 210 }, fontMechaC.size, -3, WHITE);
+                        DrawTextEx(fontAlagardC, msg2, (Vector2){ 460 + 140, 260 }, fontAlagardC.size, -2, WHITE);
+                        DrawTextEx(fontJupiterC, msg3, (Vector2){ 640 + 70, 300 }, fontJupiterC.size, 2, WHITE);
 
-                        DrawTextEx(fontAlagard, "It also includes some...", (Vector2){ 650 + 70, 400 }, GetFontBaseSize(fontAlagard)*2, 2, MAROON);
-                        DrawTextEx(fontPixelplay, "...free fonts in rBMF format...", (Vector2){ 705 - 26, 450 }, GetFontBaseSize(fontPixelplay)*2, 4, ORANGE);
-                        DrawTextEx(fontMecha, "...to be used even in...", (Vector2){ 700 + 40, 500 }, GetFontBaseSize(fontMecha)*2, 4, DARKGREEN);
-                        DrawTextEx(fontSetback, "...comercial projects...", (Vector2){ 710, 550 }, GetFontBaseSize(fontSetback)*2, 4, DARKBLUE);
-                        DrawTextEx(fontRomulus, "...completely for free!", (Vector2){ 710 + 17, 600 }, GetFontBaseSize(fontRomulus)*2, 3, DARKPURPLE);
+                        DrawTextEx(fontAlagard, "It also includes some...", (Vector2){ 650 + 70, 400 }, fontAlagard.size*2, 2, MAROON);
+                        DrawTextEx(fontPixelplay, "...free fonts in rBMF format...", (Vector2){ 705 - 26, 450 }, fontPixelplay.size*2, 4, ORANGE);
+                        DrawTextEx(fontMecha, "...to be used even in...", (Vector2){ 700 + 40, 500 }, fontMecha.size*2, 4, DARKGREEN);
+                        DrawTextEx(fontSetback, "...comercial projects...", (Vector2){ 710, 550 }, fontSetback.size*2, 4, DARKBLUE);
+                        DrawTextEx(fontRomulus, "...completely for free!", (Vector2){ 710 + 17, 600 }, fontRomulus.size*2, 3, DARKPURPLE);
                         
                         DrawText("This is a custom font spritesheet, raylib can load it automatically!", 228, 360 + 295, 10, GRAY);
 
@@ -803,9 +801,9 @@ void UpdateDrawOneFrame(void)
                     {
                         DrawText("This module give you functions to:", 48, 200, 10, GetColor(0x417794ff));
                         
-                        DrawTextEx(fontRomulus, "Draw Geometric Models", (Vector2){ 48, 230 }, GetFontBaseSize(fontRomulus)*2, 4, GetColor(0x417794ff));
-                        DrawTextEx(fontRomulus, "Load 3D Models", (Vector2){ 48, 260 }, GetFontBaseSize(fontRomulus)*2, 4, GetColor(0x417794ff));
-                        DrawTextEx(fontRomulus, "Draw 3D Models", (Vector2){ 48, 290 }, GetFontBaseSize(fontRomulus)*2, 4, GetColor(0x417794ff));
+                        DrawTextEx(fontRomulus, "Draw Geometric Models", (Vector2){ 48, 230 }, fontRomulus.size*2, 4, GetColor(0x417794ff));
+                        DrawTextEx(fontRomulus, "Load 3D Models", (Vector2){ 48, 260 }, fontRomulus.size*2, 4, GetColor(0x417794ff));
+                        DrawTextEx(fontRomulus, "Draw 3D Models", (Vector2){ 48, 290 }, fontRomulus.size*2, 4, GetColor(0x417794ff));
 
                         Begin3dMode(camera);
 
@@ -823,7 +821,7 @@ void UpdateDrawOneFrame(void)
                             DrawCylinder((Vector3){1, 0, -4}, 0, 1.5, 3, 8, GOLD);
                             DrawCylinderWires((Vector3){1, 0, -4}, 0, 1.5, 3, 8, PINK);
 
-                            DrawModelEx(cat, (Vector3){ 8.0f, 0.0f, 2.0f }, (Vector3){ 0.0f, 0.5f*framesCounter, 0.0f }, (Vector3){ 0.1f, 0.1f, 0.1f }, WHITE);
+                            DrawModelEx(cat, (Vector3){ 8.0f, 0.0f, 2.0f }, (Vector3){ 0.0f, 1.0f, 0.0f }, 0.5f*framesCounter, (Vector3){ 0.1f, 0.1f, 0.1f }, WHITE);
                             DrawGizmo((Vector3){ 8.0f, 0.0f, 2.0f });
 
                             DrawGrid(10.0, 1.0);        // Draw a grid
@@ -837,8 +835,8 @@ void UpdateDrawOneFrame(void)
                     {
                         DrawText("This module give you functions to:", 48, 200, 10, GetColor(0x8c7539ff));
                         
-                        DrawTextEx(fontRomulus, "Load and Play Sounds", (Vector2){ 48, 230 }, GetFontBaseSize(fontRomulus)*2, 4, GetColor(0x8c7539ff));
-                        DrawTextEx(fontRomulus, "Play Music (streaming)", (Vector2){ 48, 260 }, GetFontBaseSize(fontRomulus)*2, 4, GetColor(0x8c7539ff));
+                        DrawTextEx(fontRomulus, "Load and Play Sounds", (Vector2){ 48, 230 }, fontRomulus.size*2, 4, GetColor(0x8c7539ff));
+                        DrawTextEx(fontRomulus, "Play Music (streaming)", (Vector2){ 48, 260 }, fontRomulus.size*2, 4, GetColor(0x8c7539ff));
 
                         DrawText("PRESS SPACE to START PLAYING MUSIC", 135, 350, 20, GRAY);
                         DrawRectangle(150, 390, 400, 12, LIGHTGRAY);
@@ -891,7 +889,7 @@ void UpdateDrawOneFrame(void)
             case ENDING:
             {
                 // Draw ENDING screen
-                DrawTextEx(fontAlagard, "LEARN VIDEOGAMES PROGRAMMING", (Vector2){ screenWidth/2 - MeasureTextEx(fontAlagard, "LEARN VIDEOGAMES PROGRAMMING", GetFontBaseSize(fontAlagard)*4, 4).x/2, 80 }, GetFontBaseSize(fontAlagard)*4, 4, MAROON);
+                DrawTextEx(fontAlagard, "LEARN VIDEOGAMES PROGRAMMING", (Vector2){ screenWidth/2 - MeasureTextEx(fontAlagard, "LEARN VIDEOGAMES PROGRAMMING", fontAlagard.size*4, 4).x/2, 80 }, fontAlagard.size*4, 4, MAROON);
 
                 DrawTexture(raylibLogoA, logoPositionX, logoPositionY - 40, WHITE);
 
diff --git a/games/skully_escape/makefile b/games/skully_escape/makefile
index 0a343037..d47760d3 100644
--- a/games/skully_escape/makefile
+++ b/games/skully_escape/makefile
@@ -71,7 +71,7 @@ else
     CFLAGS = -O2 -Wall -std=c99
 endif
 ifeq ($(PLATFORM),PLATFORM_WEB)
-    CFLAGS = -O1 -Wall -std=c99 -s USE_GLFW=3 --preload-file resources -s ALLOW_MEMORY_GROWTH=1
+    CFLAGS = -O1 -Wall -std=c99 -s USE_GLFW=3 --preload-file resources -s ALLOW_MEMORY_GROWTH=1 --shell-file ../../templates/web_shell/shell.html
     #-s ASSERTIONS=1 --preload-file resources
     #-s ALLOW_MEMORY_GROWTH=1   # to allow memory resizing
     #-s TOTAL_MEMORY=16777216   # to specify heap memory size (default = 16MB)
@@ -81,7 +81,7 @@ endif
 ifeq ($(PLATFORM),PLATFORM_RPI)
     INCLUDES = -I. -I../../src -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads
 else
-    INCLUDES = -I. -IC:/raylib/raylib/src -IC:/raylib/raylib/src
+    INCLUDES = -I. -I../../src
 # external libraries headers
 # GLFW3
     INCLUDES += -I../../external/glfw3/include
@@ -95,7 +95,7 @@ endif
 ifeq ($(PLATFORM),PLATFORM_RPI)
     LFLAGS = -L. -L../../src -L/opt/vc/lib
 else
-    LFLAGS = -L. -LC:/raylib/raylib/src -L../../../src
+    LFLAGS = -L. -L../../src -L../../../src
     # external libraries to link with
     # GLFW3
     LFLAGS += -L../../external/glfw3/lib/$(LIBPATH)
@@ -133,14 +133,14 @@ ifeq ($(PLATFORM),PLATFORM_RPI)
     LIBS = -lraylib -lGLESv2 -lEGL -lpthread -lrt -lm -lbcm_host -lopenal
 endif
 ifeq ($(PLATFORM),PLATFORM_WEB)
-    LIBS = C:/raylib/raylib/src/libraylib.bc
+    LIBS = ../../src/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 = C:/raylib/raylib/src/resources 
+    WINFLAGS = ../../src/resources 
     #-Wl,--subsystem,windows
 endif
 
diff --git a/games/samples/snake.c b/games/snake.c
index ac2f6132..ac2f6132 100644
--- a/games/samples/snake.c
+++ b/games/snake.c
diff --git a/games/samples/space_invaders.c b/games/space_invaders.c
index c2dd0c61..c2dd0c61 100644
--- a/games/samples/space_invaders.c
+++ b/games/space_invaders.c
diff --git a/games/samples/tetris.c b/games/tetris.c
index 62400201..62400201 100644
--- a/games/samples/tetris.c
+++ b/games/tetris.c
diff --git a/src/gestures.c b/src/gestures.c
index 9028f43b..3638f23e 100644
--- a/src/gestures.c
+++ b/src/gestures.c
@@ -184,7 +184,7 @@ void ProcessGestureEvent(GestureEvent event)
         }
         else if (event.touchAction == TOUCH_MOVE)
         {
-            if ((currentGesture == GESTURE_DRAG)) eventTime = GetCurrentTime();
+            if (currentGesture == GESTURE_DRAG) eventTime = GetCurrentTime();
             
             if (!startMoving)
             {
diff --git a/src/libraylib.bc b/src/libraylib.bc
new file mode 100644
index 00000000..21039250
--- /dev/null
+++ b/src/libraylib.bc
diff --git a/src/makefile b/src/makefile
index 2d73e646..cab2ced0 100644
--- a/src/makefile
+++ b/src/makefile
@@ -94,7 +94,7 @@ endif
 ifeq ($(PLATFORM),PLATFORM_DESKTOP)
     OBJS = core.o rlgl.o glad.o shapes.o text.o textures.o models.o audio.o utils.o camera.o gestures.o stb_vorbis.o
 else
-	#GLAD only required on desktop platform
+    #GLAD only required on desktop platform
     OBJS = core.o rlgl.o shapes.o text.o textures.o models.o audio.o stb_vorbis.o utils.o camera.o gestures.o
 endif
 
diff --git a/templates/advance_game/makefile b/templates/advance_game/makefile
index b6dfc534..e19eb746 100644
--- a/templates/advance_game/makefile
+++ b/templates/advance_game/makefile
@@ -72,7 +72,8 @@ else
     CFLAGS = -O2 -Wall -std=c99
 endif
 ifeq ($(PLATFORM),PLATFORM_WEB)
-    CFLAGS = -O1 -Wall -std=c99 -s USE_GLFW=3 -s ASSERTIONS=1 --preload-file resources
+    CFLAGS = -O1 -Wall -std=c99 -s USE_GLFW=3 --preload-file resources --shell-file ../../templates/web_shell/shell.html
+    #-s ASSERTIONS=1            # to check for memory allocation errors (-O1 disables it)
     #-s ALLOW_MEMORY_GROWTH=1   # to allow memory resizing
     #-s TOTAL_MEMORY=16777216   # to specify heap memory size (default = 16MB)
 endif
@@ -87,8 +88,8 @@ else
 # external libraries headers
 # GLFW3
     INCLUDES += -I../../external/glfw3/include
-# GLEW
-    INCLUDES += -I../../external/glew/include
+# GLEW - Not required any more, replaced by GLAD
+    #INCLUDES += -I../external/glew/include
 # OpenAL Soft
     INCLUDES += -I../../external/openal_soft/include
 endif
@@ -100,12 +101,12 @@ else
     LFLAGS = -L. -L../../src -LC:/raylib/raylib/src
     # 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)
+    # GLEW: Not used, replaced by GLAD
+        #LFLAGS += -L../../external/glew/lib/$(LIBPATH)
     endif
 endif
 
@@ -128,7 +129,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 -lopengl32 -lopenal32 -lgdi32
     endif
     endif
 endif
@@ -138,8 +139,8 @@ 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
-    LIBS = C:/raylib/raylib/src/libraylib.bc
+    # NOTE: Set the correct path to libraylib.bc
+    LIBS = ../../src/libraylib.bc
 endif
 
 # define additional parameters and flags for windows
diff --git a/templates/basic_game/makefile b/templates/basic_game/makefile
index 9a52c4eb..05732040 100644
--- a/templates/basic_game/makefile
+++ b/templates/basic_game/makefile
@@ -72,7 +72,8 @@ else
     CFLAGS = -O2 -Wall -std=c99
 endif
 ifeq ($(PLATFORM),PLATFORM_WEB)
-    CFLAGS = -O1 -Wall -std=c99 -s USE_GLFW=3 -s ASSERTIONS=1 --preload-file resources
+    CFLAGS = -O1 -Wall -std=c99 -s USE_GLFW=3 --preload-file resources --shell-file ../../templates/web_shell/shell.html
+    #-s ASSERTIONS=1            # to check for memory allocation errors (-O1 disables it)
     #-s ALLOW_MEMORY_GROWTH=1   # to allow memory resizing
     #-s TOTAL_MEMORY=16777216   # to specify heap memory size (default = 16MB)
 endif
@@ -104,8 +105,8 @@ else
     ifneq ($(PLATFORM_OS),OSX)
     # OpenAL Soft
         LFLAGS += -L../../external/openal_soft/lib/$(LIBPATH)
-    # GLEW
-        LFLAGS += -L../../external/glew/lib/$(LIBPATH)
+    # GLEW: Not used, replaced by GLAD
+        #LFLAGS += -L../../external/glew/lib/$(LIBPATH)
     endif
 endif
 
@@ -138,8 +139,8 @@ 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
-    LIBS = C:/raylib/raylib/src/libraylib.bc
+    # NOTE: Set the correct path to libraylib.bc
+    LIBS = ../../src/libraylib.bc
 endif
 
 # define additional parameters and flags for windows
diff --git a/templates/simple_game/makefile b/templates/simple_game/makefile
index 30216e5d..41fef740 100644
--- a/templates/simple_game/makefile
+++ b/templates/simple_game/makefile
@@ -72,7 +72,8 @@ else
     CFLAGS = -O2 -Wall -std=c99
 endif
 ifeq ($(PLATFORM),PLATFORM_WEB)
-    CFLAGS = -O1 -Wall -std=c99 -s USE_GLFW=3 -s ASSERTIONS=1 --preload-file resources
+    CFLAGS = -O1 -Wall -std=c99 -s USE_GLFW=3 --preload-file resources --shell-file ../../templates/web_shell/shell.html
+    #-s ASSERTIONS=1            # to check for memory allocation errors (-O1 disables it)
     #-s ALLOW_MEMORY_GROWTH=1   # to allow memory resizing
     #-s TOTAL_MEMORY=16777216   # to specify heap memory size (default = 16MB)
 endif
@@ -104,8 +105,8 @@ else
     ifneq ($(PLATFORM_OS),OSX)
     # OpenAL Soft
         LFLAGS += -L../../external/openal_soft/lib/$(LIBPATH)
-    # GLEW
-        LFLAGS += -L../../external/glew/lib/$(LIBPATH)
+    # GLEW: Not used, replaced by GLAD
+        #LFLAGS += -L../../external/glew/lib/$(LIBPATH)
     endif
 endif
 
@@ -138,8 +139,8 @@ 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
-    LIBS = C:/raylib/raylib/src/libraylib.bc
+    # NOTE: Set the correct path to libraylib.bc
+    LIBS = ../../src/libraylib.bc
 endif
 
 # define additional parameters and flags for windows
diff --git a/templates/standard_game/makefile b/templates/standard_game/makefile
index ec847b0e..90f0e6f2 100644
--- a/templates/standard_game/makefile
+++ b/templates/standard_game/makefile
@@ -72,7 +72,8 @@ else
     CFLAGS = -O2 -Wall -std=c99
 endif
 ifeq ($(PLATFORM),PLATFORM_WEB)
-    CFLAGS = -O1 -Wall -std=c99 -s USE_GLFW=3 -s ASSERTIONS=1 --preload-file resources
+    CFLAGS = -O1 -Wall -std=c99 -s USE_GLFW=3 --preload-file resources --shell-file ../../templates/web_shell/shell.html
+    #-s ASSERTIONS=1            # to check for memory allocation errors (-O1 disables it)
     #-s ALLOW_MEMORY_GROWTH=1   # to allow memory resizing
     #-s TOTAL_MEMORY=16777216   # to specify heap memory size (default = 16MB)
 endif
@@ -104,8 +105,8 @@ else
     ifneq ($(PLATFORM_OS),OSX)
     # OpenAL Soft
         LFLAGS += -L../../external/openal_soft/lib/$(LIBPATH)
-    # GLEW
-        LFLAGS += -L../../external/glew/lib/$(LIBPATH)
+    # GLEW: Not used, replaced by GLAD
+        #LFLAGS += -L../../external/glew/lib/$(LIBPATH)
     endif
 endif
 
@@ -138,8 +139,8 @@ 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
-    LIBS = C:/raylib/raylib/src/libraylib.bc
+    # NOTE: Set the correct path to libraylib.bc
+    LIBS = ../../src/libraylib.bc
 endif
 
 # define additional parameters and flags for windows
author	Ray <raysan5@gmail.com>	2016-02-21 02:30:28 +0100
committer	Ray <raysan5@gmail.com>	2016-02-21 02:30:28 +0100
commit	2d1b2efb92725d6cf4a8b4f0660c739382d01f39 (patch)
tree	6b42c14cd9fa22e53e67ff53ce133aaadc3de987
parent	4b6e6d4dd45fc3a47b82af7eeb60871140a7eccf (diff)
parent	9ec47768121766cf12fef5d1bab8c8302cdac3a6 (diff)
download	raylib-2d1b2efb92725d6cf4a8b4f0660c739382d01f39.tar.gz raylib-2d1b2efb92725d6cf4a8b4f0660c739382d01f39.zip