Merge branch 'develop' of https://github.com/raysan5/raylib into develop

This commit is contained in:
raysan5 2018-02-04 13:46:45 +01:00
commit 5437458469
3 changed files with 3 additions and 3 deletions

View File

@ -13,7 +13,7 @@ matrix:
env: ARCH=i386 env: ARCH=i386
sudo: required sudo: required
- os: linux - os: linux
env: ARCH=amd64 GLFW=SYSTEM env: ARCH=amd64
sudo: required sudo: required
- os: osx - os: osx
env: ARCH=universal env: ARCH=universal

View File

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

View File

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