Merge branch 'master' into multi-display-support

CMakeLists.txt

@@ -49,6 +49,11 @@ if (UNIX AND NOT APPLE)
     list(APPEND GLFW_INCLUDE_DIR ${OPENGL_INCLUDE_DIR})
     list(APPEND GLFW_LIBRARIES ${OPENGL_gl_LIBRARY})
 
+    find_library(MATH_LIBRARY m)
+    if (MATH_LIBRARY)
+      list(APPEND GLFW_LIBRARIES ${MATH_LIBRARY})
+    endif(MATH_LIBRARY)
+
     include(${CMAKE_CURRENT_SOURCE_DIR}/CMake/CheckX11Extensions.cmake)
     
     # Check for XRandR (modern resolution switching extension)

readme.html

@@ -313,6 +313,7 @@ version of GLFW.</p>
   <li>[Cocoa] Bugfix: The OpenGL framework was not retrieved, making glfwGetProcAddress crash</li>
   <li>[X11] Added support for the <code>GLX_EXT_swap_control</code> extension as an alternative to <code>GLX_SGI_swap_control</code></li>
   <li>[X11] Added the POSIX <code>CLOCK_MONOTONIC</code> time source as the preferred method</li>
+  <li>[X11] Added dependency on libm, where present</li>
   <li>[X11] Bugfix: Calling <code>glXCreateContextAttribsARB</code> with an unavailable OpenGL version caused the application to terminate with a <code>BadMatch</code> Xlib error</li>
   <li>[X11] Bugfix: A synchronization point necessary for jitter-free locked cursor mode was incorrectly removed</li>
   <li>[Win32] Removed explicit support for versions of Windows older than Windows XP</li>

src/input.c

@@ -138,10 +138,12 @@ void _glfwInputCursorMotion(_GLFWwindow* window, int x, int y)
     }
 
     if (_glfwLibrary.mousePosCallback)
+    {
         _glfwLibrary.mousePosCallback(window,
                                       window->cursorPosX,
                                       window->cursorPosY);
     }
+}
 
 
 //////////////////////////////////////////////////////////////////////////