diff options
| author | Ray <raysan5@gmail.com> | 2018-02-04 13:47:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-04 13:47:42 +0100 |
| commit | b908a4078a2f318e6bc9cbdcb7045d1ccab0c6a4 (patch) | |
| tree | d853750091f0c5aa462a35621eecfddea5044c73 /src | |
| parent | d50e291e8639de5cfb222bffc431f0f76151d48a (diff) | |
| parent | 543745846974aa2f2fc3140238299aa3b78a30b6 (diff) | |
| download | raylib-b908a4078a2f318e6bc9cbdcb7045d1ccab0c6a4.tar.gz raylib-b908a4078a2f318e6bc9cbdcb7045d1ccab0c6a4.zip | |
Merge pull request #460 from raysan5/develop
Integrate develop branch
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/Makefile | 2 | ||||
| -rw-r--r-- | src/core.c | 4 | ||||
| -rw-r--r-- | src/raylib.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 54d3e59c..e9784ff4 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 fc85ea0a..e41a88a3 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 @@ -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 a34ef9d6..3d1f2a49 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) * |