Merge pull request #369 from raysan5/develop

Integrate Develop branch

7 files changed, 6 insertions, 10 deletions

diff --git a/examples/Makefile b/examples/Makefile
index a6040f14..14eea7da 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -557,11 +557,6 @@ physac/physics_restitution: physac/physics_restitution.c
 # compile [physac] example - physics shatter
 physac/physics_shatter: physac/physics_shatter.c
 	$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) $(PHYSAC_LIBS) -D$(PLATFORM)
-    
-ifeq ($(PLATFORM),PLATFORM_ANDROID)
-external/native_app_glue.o : native_app_glue.c native_app_glue.h
-	$(CC) -c $< $(CFLAGS) $(INCLUDE_PATHS) -D$(PLATFORM) -D$(SHAREDFLAG)
-endif
 
 # fix dylib install path name for each executable (MAC)
 fix_dylib:
diff --git a/examples/core/core_basic_window.c b/examples/core/core_basic_window.c
index fb83400a..b30f05de 100644
--- a/examples/core/core_basic_window.c
+++ b/examples/core/core_basic_window.c
@@ -15,7 +15,7 @@
 *   This example has been created using raylib 1.0 (www.raylib.com)
 *   raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details)
 *
-*   Copyright (c) 2014 Ramon Santamaria (@raysan5)
+*   Copyright (c) 2013-2016 Ramon Santamaria (@raysan5)
 *
 ********************************************************************************************/
 
diff --git a/examples/core/core_vr_simulator.c b/examples/core/core_vr_simulator.c
index 69e0f849..d919c410 100644
--- a/examples/core/core_vr_simulator.c
+++ b/examples/core/core_vr_simulator.c
@@ -22,7 +22,8 @@ int main()
     
     InitWindow(screenWidth, screenHeight, "raylib [core] example - vr simulator");
 
-    InitVrSimulator(HMD_OCULUS_RIFT_CV1);               // Init VR simulator (Oculus Rift CV1 parameters)
+    // Init VR simulator (Oculus Rift CV1 parameters)
+    InitVrSimulator(GetVrDeviceInfo(HMD_OCULUS_RIFT_CV1));
     
     // Define the camera to look into our 3d world
     Camera camera;
diff --git a/examples/models/models_cubicmap.c b/examples/models/models_cubicmap.c
index a8faa7c0..d8be9329 100644
--- a/examples/models/models_cubicmap.c
+++ b/examples/models/models_cubicmap.c
@@ -2,7 +2,7 @@
 *
 *   raylib [models] example - Cubicmap loading and drawing
 *
-*   This example has been created using raylib 1.3 (www.raylib.com)
+*   This example has been created using raylib 1.8 (www.raylib.com)
 *   raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details)
 *
 *   Copyright (c) 2015 Ramon Santamaria (@raysan5)
diff --git a/examples/models/models_heightmap.c b/examples/models/models_heightmap.c
index e887cea7..e476d1b7 100644
--- a/examples/models/models_heightmap.c
+++ b/examples/models/models_heightmap.c
@@ -2,7 +2,7 @@
 *
 *   raylib [models] example - Heightmap loading and drawing
 *
-*   This example has been created using raylib 1.3 (www.raylib.com)
+*   This example has been created using raylib 1.8 (www.raylib.com)
 *   raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details)
 *
 *   Copyright (c) 2015 Ramon Santamaria (@raysan5)
diff --git a/examples/models/resources/pixels.png b/examples/models/resources/pixels.png
deleted file mode 100644
index c9a4134b..00000000
--- a/examples/models/resources/pixels.png
+++ /dev/null
diff --git a/examples/shaders/shaders_postprocessing.c b/examples/shaders/shaders_postprocessing.c
index ae77a723..4aac5f91 100644
--- a/examples/shaders/shaders_postprocessing.c
+++ b/examples/shaders/shaders_postprocessing.c
@@ -76,7 +76,7 @@ int main()
     
     Model dwarf = LoadModel("resources/model/dwarf.obj");                   // Load OBJ model
     Texture2D texture = LoadTexture("resources/model/dwarf_diffuse.png");   // Load model texture (diffuse map)
-    dwarf.material.maps[MAP_DIFFUSE].texture = texture;          // Set dwarf model diffuse texture
+    dwarf.material.maps[MAP_DIFFUSE].texture = texture;                     // Set dwarf model diffuse texture
 
     Vector3 position = { 0.0f, 0.0f, 0.0f };                                // Set model position