From b78fd85e116063312734e2b41d9cbdc24492ac50 Mon Sep 17 00:00:00 2001 From: Camilla Berglund Date: Sat, 21 Jul 2012 23:51:08 +0200 Subject: [PATCH] Moved glext.h inclusion back. --- src/cocoa_platform.h | 5 ----- src/internal.h | 5 +++++ src/win32_platform.h | 5 ----- src/x11_glx_platform.h | 5 ----- 4 files changed, 5 insertions(+), 15 deletions(-) diff --git a/src/cocoa_platform.h b/src/cocoa_platform.h index b3fe0491..026d40ad 100644 --- a/src/cocoa_platform.h +++ b/src/cocoa_platform.h @@ -41,11 +41,6 @@ typedef void* id; #endif -// This path may need to be changed if you build GLFW using your own setup -// We ship and use our own copy of glext.h since GLFW uses fairly new -// extensions and not all operating systems come with an up-to-date version -#include "../support/GL/glext.h" - #define _GLFW_PLATFORM_WINDOW_STATE _GLFWwindowNS NS #define _GLFW_PLATFORM_CONTEXT_STATE _GLFWcontextNSGL NSGL #define _GLFW_PLATFORM_LIBRARY_WINDOW_STATE _GLFWlibraryNS NS diff --git a/src/internal.h b/src/internal.h index 37813c6f..4f34bd21 100644 --- a/src/internal.h +++ b/src/internal.h @@ -71,6 +71,11 @@ typedef struct _GLFWlibrary _GLFWlibrary; #include "../include/GL/glfw3.h" +// This path may need to be changed if you build GLFW using your own setup +// We ship and use our own copy of glext.h since GLFW uses fairly new +// extensions and not all operating systems come with an up-to-date version +#include "../support/GL/glext.h" + #if defined(_GLFW_COCOA_NSGL) #include "cocoa_platform.h" #elif defined(_GLFW_WIN32_WGL) diff --git a/src/win32_platform.h b/src/win32_platform.h index 849dd337..eeadbf22 100644 --- a/src/win32_platform.h +++ b/src/win32_platform.h @@ -63,11 +63,6 @@ #include #include -// This path may need to be changed if you build GLFW using your own setup -// We ship and use our own copy of glext.h since GLFW uses fairly new -// extensions and not all operating systems come with an up-to-date version -#include "../support/GL/glext.h" - // This path may need to be changed if you build GLFW using your own setup // We ship and use our own copy of wglext.h since GLFW uses fairly new // extensions and not all operating systems come with an up-to-date version diff --git a/src/x11_glx_platform.h b/src/x11_glx_platform.h index b5397d06..2882a197 100644 --- a/src/x11_glx_platform.h +++ b/src/x11_glx_platform.h @@ -34,11 +34,6 @@ #define GLX_GLXEXT_LEGACY #include -// This path may need to be changed if you build GLFW using your own setup -// We ship and use our own copy of glext.h since GLFW uses fairly new -// extensions and not all operating systems come with an up-to-date version -#include "../support/GL/glext.h" - // This path may need to be changed if you build GLFW using your own setup // We ship and use our own copy of glxext.h since GLFW uses fairly new // extensions and not all operating systems come with an up-to-date version