Navy.gif/glfw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Workaround for libXi and CMake 2.8.7.

Browse Source
This commit is contained in:
Camilla Berglund 2013-09-13 14:41:13 +02:00
parent 3415f3ccde
commit 4ff8095dee
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -211,7 +211,13 @@ if (_GLFW_X11)
endif() endif()
list(APPEND glfw_INCLUDE_DIRS ${X11_Xinput_INCLUDE_PATH}) list(APPEND glfw_INCLUDE_DIRS ${X11_Xinput_INCLUDE_PATH})
list(APPEND glfw_LIBRARIES ${X11_Xinput_LIB})
if (X11_Xinput_LIB)
list(APPEND glfw_LIBRARIES ${X11_Xinput_LIB})
else()
# Backwards compatibility (bug in CMake 2.8.7)
list(APPEND glfw_LIBRARIES Xi)
endif()
set(GLFW_PKG_DEPS "${GLFW_PKG_DEPS} xi") set(GLFW_PKG_DEPS "${GLFW_PKG_DEPS} xi")
# Check for Xf86VidMode (fallback gamma control) # Check for Xf86VidMode (fallback gamma control)

2
README.md
View File

@ -207,6 +207,7 @@ See the [GLFW documentation](http://www.glfw.org/docs/latest/).
- [Win32] Bugfix: `_WIN32_WINNT` was not set to Windows XP or later - [Win32] Bugfix: `_WIN32_WINNT` was not set to Windows XP or later
- [Win32] Bugfix: Legacy MinGW needs `WINVER` and `UNICODE` before `stddef.h` - [Win32] Bugfix: Legacy MinGW needs `WINVER` and `UNICODE` before `stddef.h`
- [X11] Bugfix: Events for mouse buttons 4 and above were not reported - [X11] Bugfix: Events for mouse buttons 4 and above were not reported
- [X11] Bugfix: CMake 2.8.7 does not set `X11_Xinput_LIB` even when found
## Contact ## Contact
@ -277,6 +278,7 @@ skills.
- Bruce Mitchener - Bruce Mitchener
- Jeff Molofee - Jeff Molofee
- Jon Morton - Jon Morton
- Pierre Moulon
- Julian Møller - Julian Møller
- Ozzy - Ozzy
- Peoro - Peoro