Merge fix.

src/cocoa/CMakeLists.txt

@@ -1,42 +1,37 @@
 
-configure_file(
-    ${CMAKE_CURRENT_SOURCE_DIR}/libglfw.pc.cmake 
-    ${CMAKE_CURRENT_BINARY_DIR}/libglfw.pc @ONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libglfw.pc.cmake 
+               ${CMAKE_CURRENT_BINARY_DIR}/libglfw.pc @ONLY)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} 
                     ${GLFW_SOURCE_DIR}/src
                     ${GLFW_BINARY_DIR}/src
                     ${GLFW_INCLUDE_DIR})
 
-set(cocoa_SOURCES
-    cocoa_enable.m
-    cocoa_fullscreen.m
-    cocoa_gamma.m
-    cocoa_glext.m
-    cocoa_init.m
-    cocoa_joystick.m
-    cocoa_time.m
-    cocoa_window.m)
+set(cocoa_SOURCES cocoa_enable.m
+                  cocoa_fullscreen.m
+                  cocoa_gamma.m
+                  cocoa_glext.m
+                  cocoa_init.m
+                  cocoa_joystick.m
+                  cocoa_time.m
+                  cocoa_window.m)
 
 # For some reason, CMake doesn't know about .m
 set_source_files_properties(${cocoa_SOURCES} PROPERTIES LANGUAGE C)
 
-set(libglfw_SOURCES
-    ${common_SOURCES}
-    ${cocoa_SOURCES})
+set(libglfw_SOURCES ${common_SOURCES} ${cocoa_SOURCES})
 
 add_library(libglfwStatic STATIC ${libglfw_SOURCES})
 add_library(libglfwShared SHARED ${libglfw_SOURCES}) 
 target_link_libraries(libglfwShared  ${GLFW_LIBRARIES})
 set_target_properties(libglfwStatic libglfwShared PROPERTIES 
-    CLEAN_DIRECT_OUTPUT 1
-    OUTPUT_NAME glfw
-)
+                      CLEAN_DIRECT_OUTPUT 1
+                      OUTPUT_NAME glfw)
 
 # Append -fno-common to the compile flags to work around a bug in the Apple GCC
 get_target_property(CFLAGS libglfwShared COMPILE_FLAGS)
 if(NOT CFLAGS)
-  set(CFLAGS "")
+    set(CFLAGS "")
 endif(NOT CFLAGS)
 set_target_properties(libglfwShared PROPERTIES COMPILE_FLAGS "${CFLAGS} -fno-common")
 

src/cocoa/cocoa_window.m

@@ -70,8 +70,8 @@
     window->width = contentRect.size.width;
     window->height = contentRect.size.height;
 
-    if (window->windowSizeCallback)
-        window->windowSizeCallback(window, window->width, window->height);
+    if (_glfwLibrary.windowSizeCallback)
+        _glfwLibrary.windowSizeCallback(window, window->width, window->height);
 }
 
 - (void)windowDidMove:(NSNotification *)notification
@@ -95,16 +95,16 @@
 {
     window->iconified = GL_TRUE;
 
-    if (window->windowIconifyCallback)
-        window->windowIconifyCallback(window, window->iconified);
+    if (_glfwLibrary.windowIconifyCallback)
+        _glfwLibrary.windowIconifyCallback(window, window->iconified);
 }
 
 - (void)windowDidDeminiaturize:(NSNotification *)notification
 {
     window->iconified = GL_FALSE;
 
-    if (window->windowIconifyCallback)
-        window->windowIconifyCallback(window, window->iconified);
+    if (_glfwLibrary.windowIconifyCallback)
+        _glfwLibrary.windowIconifyCallback(window, window->iconified);
 }
 
 - (void)windowDidBecomeKey:(NSNotification *)notification
@@ -362,8 +362,8 @@ static int convertMacKeyCode(unsigned int macKeyCode)
         window->mousePosY = [[window->NS.window contentView] bounds].size.height - p.y;
     }
 
-    if (window->mousePosCallback)
-        window->mousePosCallback(window, window->mousePosX, window->mousePosY);
+    if (_glfwLibrary.mousePosCallback)
+        _glfwLibrary.mousePosCallback(window, window->mousePosX, window->mousePosY);
 }
 
 - (void)rightMouseDown:(NSEvent *)event