Merge pull request #460 from raysan5/develop

Integrate develop branch
raysan5 · Feb 4, 2018 · b908a40 · b908a40
2 parents d50e291 + 5437458
commit b908a40
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,7 +13,7 @@ matrix:
       env: ARCH=i386
       sudo: required
     - os: linux
-      env: ARCH=amd64 GLFW=SYSTEM
+      env: ARCH=amd64
       sudo: required
     - os: osx
       env: ARCH=universal

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -2,7 +2,7 @@
 project(raylib)
 include("../utils.cmake")
 
-set(PROJECT_VERSION 1.9.2)
+set(PROJECT_VERSION 1.9.4)
 set(API_VERSION 1)
 set(RAYLIB raylib)    # Name of the generated library
 

diff --git a/src/Makefile b/src/Makefile
@@ -44,7 +44,7 @@
 # Define required raylib variables
 PLATFORM          ?= PLATFORM_DESKTOP
 RAYLIB_PATH        = ..
-RAYLIB_VERSION     = 1.9.2
+RAYLIB_VERSION     = 1.9.4
 RAYLIB_API_VERSION = 1
 # Library type used for raylib: STATIC (.a) or SHARED (.so/.dll)
 RAYLIB_LIBTYPE    ?= STATIC

diff --git a/src/core.c b/src/core.c
@@ -431,7 +431,7 @@ static void *GamepadThread(void *arg);                  // Mouse reading thread
 // NOTE: data parameter could be used to pass any kind of required data to the initialization
 void InitWindow(int width, int height, void *data)
 {
-    TraceLog(LOG_INFO, "Initializing raylib (v1.9.3-dev)");
+    TraceLog(LOG_INFO, "Initializing raylib (v1.9.4-dev)");
 
 #if defined(PLATFORM_DESKTOP)
     windowTitle = (char *)data;
@@ -501,7 +501,7 @@ void InitWindow(int width, int height, void *data)
 // NOTE: data parameter could be used to pass any kind of required data to the initialization
 void InitWindow(int width, int height, void *data)
 {
-    TraceLog(LOG_INFO, "Initializing raylib (v1.9.3-dev)");
+    TraceLog(LOG_INFO, "Initializing raylib (v1.9.4-dev)");
 
     screenWidth = width;
     screenHeight = height;

diff --git a/src/raylib.h b/src/raylib.h
@@ -1,6 +1,6 @@
 /**********************************************************************************************
 *
-*   raylib v1.9.3-dev
+*   raylib v1.9.4-dev
 *
 *   A simple and easy-to-use library to learn videogames programming (www.raylib.com)
 *