mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-26 06:14:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated references to OS X (previously Mac OS X).

Browse Source
This commit is contained in:
Camilla Berglund 2013-07-10 15:26:16 +02:00
parent c8b01f61d6
commit 41a1374744
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -56,7 +56,7 @@ along with the library.
built along with the library. built along with the library.
#### Mac OS X specific options #### OS X specific options
`GLFW_USE_CHDIR` determines whether `glfwInit` changes the current `GLFW_USE_CHDIR` determines whether `glfwInit` changes the current
directory of bundled applications to the `Contents/Resources` directory. directory of bundled applications to the `Contents/Resources` directory.

2
docs/build.dox
View File

@ -206,6 +206,6 @@ it from the command-line.
The OpenGL framework contains both the OpenGL and GLU APIs, so there is nothing The OpenGL framework contains both the OpenGL and GLU APIs, so there is nothing
special to do when using GLU. Also note that even though your machine may have special to do when using GLU. Also note that even though your machine may have
`libGL`-style OpenGL libraries, they are for use with the X Window System and `libGL`-style OpenGL libraries, they are for use with the X Window System and
will *not* work with the Mac OS X native version of GLFW. will *not* work with the OS X native version of GLFW.
*/ */

12
docs/compat.dox
View File

@ -112,14 +112,14 @@ context profiles. Where this extension is unavailable, setting the
`GLFW_OPENGL_PROFILE` hint to anything but zero will cause @ref glfwCreateWindow `GLFW_OPENGL_PROFILE` hint to anything but zero will cause @ref glfwCreateWindow
to fail. to fail.
@section cmopat_osx OpenGL 3.2 on Mac OS X @section cmopat_osx OpenGL 3.2 on OS X
Support for OpenGL 3.0 and above was introduced with Mac OS X 10.7, and even Support for OpenGL 3.0 and above was introduced with OS X 10.7, and even then
then only forward-compatible OpenGL 3.2 core profile contexts are supported. only forward-compatible OpenGL 3.2 core profile contexts are supported. There
There is also still no mechanism for requesting debug contexts. Versions of is also still no mechanism for requesting debug contexts. Versions of OS
Mac OS X earlier than 10.7 support at most OpenGL version 2.1. X earlier than 10.7 support at most OpenGL version 2.1.
Because of this, on Mac OS X 10.7, the `GLFW_CONTEXT_VERSION_MAJOR` and Because of this, on OS X 10.7, the `GLFW_CONTEXT_VERSION_MAJOR` and
`GLFW_CONTEXT_VERSION_MINOR` hints will fail if given a version above 3.2, the `GLFW_CONTEXT_VERSION_MINOR` hints will fail if given a version above 3.2, the
`GLFW_OPENGL_FORWARD_COMPAT` is required for creating OpenGL 3.2 contexts, the `GLFW_OPENGL_FORWARD_COMPAT` is required for creating OpenGL 3.2 contexts, the
`GLFW_OPENGL_DEBUG_CONTEXT` hint is ignored and setting the `GLFW_OPENGL_DEBUG_CONTEXT` hint is ignored and setting the

4
src/cocoa_window.m
View File

@ -220,7 +220,7 @@ static void centerCursor(_GLFWwindow *window)
@end @end
// Translates Mac OS X key modifiers into GLFW ones // Translates OS X key modifiers into GLFW ones
// //
static int translateFlags(NSUInteger flags) static int translateFlags(NSUInteger flags)
{ {
@ -238,7 +238,7 @@ static int translateFlags(NSUInteger flags)
return mods; return mods;
} }
// Translates a Mac OS X keycode to a GLFW keycode // Translates a OS X keycode to a GLFW keycode
// //
static int translateKey(unsigned int key) static int translateKey(unsigned int key)
{ {

12
src/nsgl_context.m
View File

@ -74,7 +74,7 @@ int _glfwCreateContext(_GLFWwindow* window,
{ {
unsigned int attributeCount = 0; unsigned int attributeCount = 0;
// Mac OS X needs non-zero color size, so set resonable values // OS X needs non-zero color size, so set resonable values
int colorBits = fbconfig->redBits + fbconfig->greenBits + fbconfig->blueBits; int colorBits = fbconfig->redBits + fbconfig->greenBits + fbconfig->blueBits;
if (colorBits == 0) if (colorBits == 0)
colorBits = 24; colorBits = 24;
@ -93,7 +93,7 @@ int _glfwCreateContext(_GLFWwindow* window,
if (wndconfig->glMajor == 3 && wndconfig->glMinor < 2) if (wndconfig->glMajor == 3 && wndconfig->glMinor < 2)
{ {
_glfwInputError(GLFW_VERSION_UNAVAILABLE, _glfwInputError(GLFW_VERSION_UNAVAILABLE,
"NSOpenGL: The targeted version of Mac OS X does not " "NSOpenGL: The targeted version of OS X does not "
"support OpenGL 3.0 or 3.1"); "support OpenGL 3.0 or 3.1");
return GL_FALSE; return GL_FALSE;
} }
@ -103,7 +103,7 @@ int _glfwCreateContext(_GLFWwindow* window,
if (!wndconfig->glForward) if (!wndconfig->glForward)
{ {
_glfwInputError(GLFW_VERSION_UNAVAILABLE, _glfwInputError(GLFW_VERSION_UNAVAILABLE,
"NSOpenGL: The targeted version of Mac OS X only " "NSOpenGL: The targeted version of OS X only "
"supports OpenGL 3.2 and later versions if they " "supports OpenGL 3.2 and later versions if they "
"are forward-compatible"); "are forward-compatible");
return GL_FALSE; return GL_FALSE;
@ -112,7 +112,7 @@ int _glfwCreateContext(_GLFWwindow* window,
if (wndconfig->glProfile != GLFW_OPENGL_CORE_PROFILE) if (wndconfig->glProfile != GLFW_OPENGL_CORE_PROFILE)
{ {
_glfwInputError(GLFW_VERSION_UNAVAILABLE, _glfwInputError(GLFW_VERSION_UNAVAILABLE,
"NSOpenGL: The targeted version of Mac OS X only " "NSOpenGL: The targeted version of OS X only "
"supports OpenGL 3.2 and later versions if they " "supports OpenGL 3.2 and later versions if they "
"use the core profile"); "use the core profile");
return GL_FALSE; return GL_FALSE;
@ -123,7 +123,7 @@ int _glfwCreateContext(_GLFWwindow* window,
if (wndconfig->glMajor > 2) if (wndconfig->glMajor > 2)
{ {
_glfwInputError(GLFW_VERSION_UNAVAILABLE, _glfwInputError(GLFW_VERSION_UNAVAILABLE,
"NSOpenGL: The targeted version of Mac OS X does not " "NSOpenGL: The targeted version of OS X does not "
"support OpenGL version 3.0 or above"); "support OpenGL version 3.0 or above");
return GL_FALSE; return GL_FALSE;
} }
@ -133,7 +133,7 @@ int _glfwCreateContext(_GLFWwindow* window,
if (wndconfig->glRobustness) if (wndconfig->glRobustness)
{ {
_glfwInputError(GLFW_VERSION_UNAVAILABLE, _glfwInputError(GLFW_VERSION_UNAVAILABLE,
"NSOpenGL: Mac OS X does not support OpenGL robustness " "NSOpenGL: OS X does not support OpenGL robustness "
"strategies"); "strategies");
return GL_FALSE; return GL_FALSE;
} }