From 184df917bebdcad54ca0334ff80fe05a0f924817 Mon Sep 17 00:00:00 2001 From: Ahmad Fatoum Date: Sun, 4 Feb 2018 13:33:55 +0100 Subject: [PATCH 1/3] Travis CI: Don't use external GLFW MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit While nice to test, this would mean that the tagged release will depend on GLFW as well… Therefore disable it for now. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 55d8357d3b78..e3a0e67da3b9 100644 --- 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 From 19f280f4b793963eeadad9c2b2cab38d07715992 Mon Sep 17 00:00:00 2001 From: Ahmad Fatoum Date: Sun, 4 Feb 2018 13:23:08 +0100 Subject: [PATCH 2/3] Bump version to 1.9.4 --- src/CMakeLists.txt | 2 +- src/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 54d3e59c44ee..e9784ff4dce9 100644 --- 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 index fc85ea0ae95b..e41a88a3a9a5 100644 --- 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 From 3a11cc5e31f86be4f57b577b5aef443db80d0c81 Mon Sep 17 00:00:00 2001 From: raysan5 Date: Sun, 4 Feb 2018 13:44:41 +0100 Subject: [PATCH 3/3] Incremeted version to align with CMake --- src/core.c | 4 ++-- src/raylib.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core.c b/src/core.c index 1cafac28f152..29f9a23a934c 100644 --- 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 index a34ef9d619b7..3d1f2a490410 100644 --- 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) *