UnrealXR/raylib
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #460 from raysan5/develop

Browse source 
Integrate develop branch
This commit is contained in:
Ray 2018-02-04 13:47:42 +01:00 • committed by GitHub
commit b908a4078a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
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

2
src/CMakeLists.txt
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

2
src/Makefile
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

4
src/core.c
View file

@ -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 // NOTE: data parameter could be used to pass any kind of required data to the initialization
void InitWindow(int width, int height, void *data) 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) #if defined(PLATFORM_DESKTOP)
windowTitle = (char *)data; 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 // NOTE: data parameter could be used to pass any kind of required data to the initialization
void InitWindow(int width, int height, void *data) 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; screenWidth = width;
screenHeight = height; screenHeight = height;

2
src/raylib.h
View file

@ -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) * A simple and easy-to-use library to learn videogames programming (www.raylib.com)
* *