Merge branch 'master' into multi-monitor

This commit is contained in:
Camilla Berglund
2012-11-08 16:29:56 +01:00
7 changed files with 20 additions and 20 deletions
-4
View File
@@ -182,10 +182,6 @@ if (_GLFW_X11_GLX)
set(GLFW_PKG_LIBS "${GLFW_PKG_LIBS} -ldl")
endif()
endif()
if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
set(_GLFW_HAS_LINUX_JOYSTICKS 1)
endif()
endif()
#--------------------------------------------------------------------