Merge pull request #289 from raysan5/develop

Integrate develop branch

Author: raysan5

.gitignore

@@ -42,7 +42,7 @@ Thumbs.db
 *.sbr
 *.sdf
 obj/
-[Rr]elease/
+# [Rr]elease/
 [Rr]elease.win32/
 _ReSharper*/
 [Tt]est[Rr]esult*
@@ -90,8 +90,6 @@ xcschememanagement.plist
 xcuserdata/
 DerivedData/
 *.dll
-src/libraylib.a
-src/libraylib.bc
 
 # external libraries DLLs
 !src/external/glfw3/lib/win32/glfw3.dll
@@ -122,6 +120,8 @@ docs/examples/web/*/*.html
 !docs/examples/web/models/loader.html
 
 # raylib release libs
+src/libraylib.a
+src/libraylib.bc
 !release/android/armeabi-v7a/libraylib.a
 !release/android/armeabi-v7a/libraylib.so
 !release/linux/libraylib.a

docs/examples/web/core/core_2d_camera.js

@@ -30,16 +30,16 @@
 # WARNING: To compile to HTML5, code must be redesigned to use emscripten.h and emscripten_set_main_loop()
 PLATFORM ?= PLATFORM_DESKTOP
 
+# define raylib directory for include and library
+RAYLIB_PATH ?= C:\raylib\raylib
+
 # define NO to use OpenAL Soft as static library (shared by default)
 SHARED_OPENAL ?= NO
 
 ifeq ($(PLATFORM),PLATFORM_WEB)
     SHARED_OPENAL = NO
 endif
 
-# define raylib directory for include and library
-RAYLIB_PATH ?= C:\raylib\raylib
-
 # determine PLATFORM_OS in case PLATFORM_DESKTOP selected
 ifeq ($(PLATFORM),PLATFORM_DESKTOP)
     # No uname.exe on MinGW!, but OS=Windows_NT on Windows! ifeq ($(UNAME),Msys) -> Windows

examples/Makefile

@@ -11,22 +11,24 @@
 *       jar_mod - MOD audio file loading
 *
 *   Compile audio module using:
-*   gcc -c audio.c stb_vorbis.c -Wall -std=c99 -DAUDIO_STANDALONE
+*       gcc -c audio.c stb_vorbis.c -Wall -std=c99 -DAUDIO_STANDALONE -DAL_LIBTYPE_STATIC
 *
 *   Compile example using:
-*   gcc -o $(NAME_PART).exe $(FILE_NAME) audio.o stb_vorbis.o -lopenal32 -std=c99
+*       gcc -o audio_standalone.exe audio_standalone.c audio.o stb_vorbis.o -lopenal32 -lwinmm /
+*           -Wall -std=c99 -Wl,-allow-multiple-definition
 *
-*   This example has been created using raylib 1.5 (www.raylib.com)
+*   This example has been created using raylib 1.7 (www.raylib.com)
 *   raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details)
 *
-*   Copyright (c) 2015 Ramon Santamaria (@raysan5)
+*   Copyright (c) 2017 Ramon Santamaria (@raysan5)
 *
 ********************************************************************************************/
 
 #include <stdio.h>
 #if defined(_WIN32)
-#include <conio.h>      // Windows only, no stardard library
+#include <conio.h>          // Windows only, no stardard library
 #endif
+
 #include "audio.h"
 
 #if defined(__linux__)

examples/others/audio_standalone.c

@@ -6,21 +6,22 @@
 *         OpenGL 1.1 does not support shaders but it can also be used.
 *
 *   Compile rlgl module using:
-*   gcc -c rlgl.c -Wall -std=c99 -DRLGL_STANDALONE -DRAYMATH_IMPLEMENTATION -DGRAPHICS_API_OPENGL_33
+*       gcc -c $(RAYLIB_DIR)\raylib\src\rlgl.c -DRLGL_STANDALONE -DRAYMATH_IMPLEMENTATION -DGRAPHICS_API_OPENGL_33 /
+*           -I$(RAYLIB_DIR)\raylib\src\external -Wall -std=c99
 *
 *   NOTE: rlgl module requires the following header-only files:
 *       external/glad.h - OpenGL extensions loader (stripped to only required extensions)
-*       shader_standard.h - Standard shader for materials and lighting
 *       shader_distortion.h - Distortion shader for VR
 *       raymath.h - Vector and matrix math functions
 *
 *   Compile example using:
-*   gcc -o rlgl_standalone.exe rlgl_standalone.c rlgl.o -lglfw3 -lopengl32 -lgdi32 -std=c99
+*       gcc -o rlgl_standalone.exe rlgl_standalone.c rlgl.o -s $(RAYLIB_DIR)\raylib\raylib_icon -I$(RAYLIB_DIR)\raylib\src /
+*           -L. -L$(RAYLIB_DIR)\raylib\src -lglfw3 -lopengl32 -lgdi32 -Wall -std=c99
 *
-*   This example has been created using raylib 1.5 (www.raylib.com)
+*   This example has been created using raylib 1.7 (www.raylib.com)
 *   raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details)
 *
-*   Copyright (c) 2015 Ramon Santamaria (@raysan5)
+*   Copyright (c) 2017 Ramon Santamaria (@raysan5)
 *
 ********************************************************************************************/
 

examples/others/resources/audio/guitar_noodling.ogg

@@ -44,8 +44,11 @@
 # possible platforms: PLATFORM_DESKTOP PLATFORM_ANDROID PLATFORM_RPI PLATFORM_WEB
 PLATFORM ?= PLATFORM_DESKTOP
 
+# define raylib default path, required to look for emsdk and android-toolchain
+RAYLIB_PATH ?= C:/raylib
+
 # define YES if you want shared/dynamic version of library instead of static (default)
-SHARED ?= NO
+SHARED_RAYLIB ?= NO
 
 # use OpenAL Soft as shared library (.so / .dll)
 # NOTE: If defined NO, static OpenAL Soft library should be provided
@@ -84,7 +87,7 @@ endif
 
 ifeq ($(PLATFORM),PLATFORM_WEB)
     # Emscripten required variables
-    EMSDK_PATH = C:/emsdk
+    EMSDK_PATH = $(RAYLIB_PATH)/emsdk
     EMSCRIPTEN_VERSION = 1.37.9
     CLANG_VERSION=e1.37.9_64bit
     PYTHON_VERSION=2.7.5.3_64bit
@@ -101,7 +104,7 @@ ifeq ($(PLATFORM),PLATFORM_ANDROID)
     # Android standalone toolchain path
     # NOTE: This path is also used if toolchain generation
     #ANDROID_TOOLCHAIN = $(CURDIR)/toolchain
-    ANDROID_TOOLCHAIN = C:/raylib/android-toolchain
+    ANDROID_TOOLCHAIN = $(RAYLIB_PATH)/android-toolchain
 
     # Android architecture: ARM or ARM64
     ANDROID_ARCH ?= ARM
@@ -209,7 +212,7 @@ endif
 #CFLAGSEXTRA = -Wextra -Wmissing-prototypes -Wstrict-prototypes
 
 # if shared library required, make sure code is compiled as position independent
-ifeq ($(SHARED),YES)
+ifeq ($(SHARED_RAYLIB),YES)
     CFLAGS += -fPIC
     SHAREDFLAG = BUILDING_DLL
     SHAREDLIBS = -Lexternal/glfw3/lib/win32 -Lexternal/openal_soft/lib/win32 -lglfw3 -lgdi32
@@ -313,7 +316,7 @@ ifeq ($(PLATFORM),PLATFORM_WEB)
 	emcc -O1 $(OBJS) -o $(OUTPUT_PATH)/libraylib.bc
 	@echo "libraylib.bc generated (web version)!"
 else
-    ifeq ($(SHARED),YES)
+    ifeq ($(SHARED_RAYLIB),YES)
         ifeq ($(PLATFORM_OS),LINUX)
             # compile raylib to shared library version for GNU/Linux.
             # WARNING: you should type "make clean" before doing this target
@@ -388,7 +391,7 @@ ifeq ($(ROOT),root)
         # libraries and header files. These directory (/usr/local/lib and
         # /usr/local/include/) are for libraries that are installed
         # manually (without a package manager).
-        ifeq ($(SHARED),YES)
+        ifeq ($(SHARED_RAYLIB),YES)
 			cp --update $(OUTPUT_PATH)/libraylib.so /usr/local/lib/libraylib.so
         else
 			cp --update raylib.h /usr/local/include/raylib.h
@@ -408,7 +411,7 @@ uninstall :
 ifeq ($(ROOT),root)
     ifeq ($(PLATFORM_OS),LINUX)
 			rm --force /usr/local/include/raylib.h
-        ifeq ($(SHARED),YES)
+        ifeq ($(SHARED_RAYLIB),YES)
 			rm --force /usr/local/lib/libraylib.so
         else
 			rm --force /usr/local/lib/libraylib.a