diff --git a/include/GL/glfw3.h b/include/GL/glfw3.h
index 94ceaf87..4951c0eb 100644
--- a/include/GL/glfw3.h
+++ b/include/GL/glfw3.h
@@ -141,7 +141,7 @@ extern "C" {
/* Include the chosen OpenGL header and, optionally, the GLU header.
*/
#if defined(__APPLE_CC__)
- #if defined(GLFW_INCLUDE_GL3)
+ #if defined(GLFW_INCLUDE_GLCOREARB)
#include
#else
#define GL_GLEXT_LEGACY
@@ -151,8 +151,8 @@ extern "C" {
#include
#endif
#else
- #if defined(GLFW_INCLUDE_GL3)
- #include
+ #if defined(GLFW_INCLUDE_GLCOREARB)
+ #include
#else
#include
#endif
diff --git a/readme.html b/readme.html
index 95cd2472..e240edd1 100644
--- a/readme.html
+++ b/readme.html
@@ -282,7 +282,7 @@ version of GLFW.
Added GLFW_OPENGL_ES2_PROFILE
profile for creating OpenGL ES 2.0 contexts using the GLX_EXT_create_context_es2_profile
and WGL_EXT_create_context_es2_profile
extensions
Added GLFW_OPENGL_ROBUSTNESS
window hint and associated strategy tokens for GL_ARB_robustness
support
Added GLFW_OPENGL_REVISION
window parameter to make up for removal of glfwGetGLVersion
- Added GLFW_INCLUDE_GL3
macro for telling the GLFW header to include gl3.h
header instead of gl.h
+ Added GLFW_INCLUDE_GLCOREARB
macro for including glcorearb.h
instead of gl.h
Added GLFW_VISIBLE
window hint and parameter for controlling and polling window visibility
Added windows
simple multi-window test program
Added sharing
simple OpenGL object sharing test program
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d9ce8fb3..47d99d30 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -3,6 +3,10 @@ include_directories(${GLFW_SOURCE_DIR}/src
${GLFW_BINARY_DIR}/src
${glfw_INCLUDE_DIRS})
+if (MSVC)
+ add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+endif()
+
set(common_HEADERS ${GLFW_SOURCE_DIR}/include/GL/glfw3.h internal.h)
set(common_SOURCES clipboard.c gamma.c init.c input.c joystick.c monitor.c
opengl.c time.c window.c)
diff --git a/src/window.c b/src/window.c
index 3da4936d..f2bff21d 100644
--- a/src/window.c
+++ b/src/window.c
@@ -269,7 +269,7 @@ GLFWAPI GLFWwindow glfwCreateWindow(int width, int height,
wndconfig.glProfile = _glfwLibrary.hints.glProfile;
wndconfig.glRobustness = _glfwLibrary.hints.glRobustness ? GL_TRUE : GL_FALSE;
wndconfig.monitor = (_GLFWmonitor*) monitor;
- wndconfig.share = share;
+ wndconfig.share = (_GLFWwindow*) share;
// Reset to default values for the next call
_glfwSetDefaultWindowHints();