diff options
| author | raysan5 <raysan5@gmail.com> | 2018-02-04 13:46:45 +0100 |
|---|---|---|
| committer | raysan5 <raysan5@gmail.com> | 2018-02-04 13:46:45 +0100 |
| commit | 543745846974aa2f2fc3140238299aa3b78a30b6 (patch) | |
| tree | d853750091f0c5aa462a35621eecfddea5044c73 | |
| parent | 3a11cc5e31f86be4f57b577b5aef443db80d0c81 (diff) | |
| parent | 327aec9da44f95ccdadabb2c258c8bbf6d9a7f7b (diff) | |
| download | raylib-543745846974aa2f2fc3140238299aa3b78a30b6.tar.gz raylib-543745846974aa2f2fc3140238299aa3b78a30b6.zip | |
Merge branch 'develop' of https://github.com/raysan5/raylib into develop
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/Makefile | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 55d8357d..e3a0e67d 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 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 |