浏览代码

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

raysan5 7 年之前
父节点
当前提交
5437458469
共有 3 个文件被更改,包括 3 次插入3 次删除
  1. 1 1
      .travis.yml
  2. 1 1
      src/CMakeLists.txt
  3. 1 1
      src/Makefile

+ 1 - 1
.travis.yml

@@ -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

+ 1 - 1
src/CMakeLists.txt

@@ -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
 
 

+ 1 - 1
src/Makefile

@@ -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