Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2025-10-04 13:46:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge fe346609e8 into ce4672d74b

Browse Source
This commit is contained in:
linkmauve 2017-12-14 14:31:31 +00:00 committed by GitHub
commit 71a6010855
32 changed files with 168 additions and 167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@ -50,6 +50,7 @@ matrix:
- os: osx - os: osx
env: BUILD_SHARED_LIBS=OFF env: BUILD_SHARED_LIBS=OFF
script: script:
- if grep -Inr '\s$' src include docs deps tests examples CMake *.md .gitattributes .gitignore .github; then echo Trailing whitespace found, aborting.; exit 1; fi
- mkdir build - mkdir build
- cd build - cd build
- if test -n "${USE_WAYLAND}"; then wget https://mirrors.kernel.org/ubuntu/pool/universe/e/extra-cmake-modules/extra-cmake-modules_5.38.0a-0ubuntu1_amd64.deb; fi - if test -n "${USE_WAYLAND}"; then wget https://mirrors.kernel.org/ubuntu/pool/universe/e/extra-cmake-modules/extra-cmake-modules_5.38.0a-0ubuntu1_amd64.deb; fi

2
include/GLFW/glfw3.h
View File

@ -1067,7 +1067,7 @@ extern "C" {
* @sa @ref glfwGetProcAddress * @sa @ref glfwGetProcAddress
* *
* @since Added in version 3.0. * @since Added in version 3.0.
*
* @ingroup context * @ingroup context
*/ */
typedef void (*GLFWglproc)(void); typedef void (*GLFWglproc)(void);