Merge branch 'master' of github.com:elmindreda/glfw

Conflicts:
	CMakeLists.txt
	src/egl_context.c
This commit is contained in:
Camilla Berglund
2013-01-05 18:37:12 +01:00
2 changed files with 7 additions and 3 deletions
+1 -1
View File
@@ -242,7 +242,7 @@ if (_GLFW_EGL)
set(CMAKE_REQUIRED_LIBRARIES ${EGL_LIBRARY})
if (_GLFW_X11)
if (UNIX)
set(GLFW_PKG_DEPS "${GLFW_PKG_DEPS} egl")
endif()