caio/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2026-01-25 13:33:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into multi-monitor

Browse Source 
Conflicts:
	src/window.c
This commit is contained in:
Camilla Berglund
2012-09-27 23:32:26 +02:00
parent 1be1636326 410a4e29e1
commit 508c7fe0e6
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/GL/glfw3.h
View File

@@ -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 <OpenGL/gl3.h>
#else
#define GL_GLEXT_LEGACY
@@ -151,8 +151,8 @@ extern "C" {
#include <OpenGL/glu.h>
#endif
#else
#if defined(GLFW_INCLUDE_GL3)
#include <GL3/gl3.h>
#if defined(GLFW_INCLUDE_GLCOREARB)
#include <GL/glcorearb.h>
#else
#include <GL/gl.h>
#endif