Skip to content

Integrate develop branch #460

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Feb 4, 2018
Merged

Integrate develop branch #460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
184df91
Travis CI: Don't use external GLFW
a3f Feb 4, 2018
19f280f
Bump version to 1.9.4
a3f Feb 4, 2018
327aec9
Merge pull request #459 from a3f/develop
raysan5 Feb 4, 2018
3a11cc5
Incremeted version to align with CMake
raysan5 Feb 4, 2018
5437458
Merge branch 'develop' of https://github.com/raysan5/raylib into develop
raysan5 Feb 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/core.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/raylib.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
*
Expand Down