From e04c25d378505ffbd31fcffe87476411669837c8 Mon Sep 17 00:00:00 2001 From: Rodrigo Braz Monteiro Date: Wed, 25 Apr 2007 18:57:56 +0000 Subject: [PATCH] Probably fixed OS X errors on gl_wrap.cpp, but I really don't think that I want to fix the retarded warnings Originally committed to SVN as r1144. --- aegisub/gl_wrap.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/aegisub/gl_wrap.cpp b/aegisub/gl_wrap.cpp index 36215e133..1b180477c 100644 --- a/aegisub/gl_wrap.cpp +++ b/aegisub/gl_wrap.cpp @@ -54,7 +54,9 @@ void* glGetProc(const char *str) { return wglGetProcAddress(str); } #else #ifdef __WXMAC_OSX__ +#ifndef HAVE_APPLE_OPENGL_FRAMEWORK void* glGetProc(const char *str) { return aglGetProcAddress(str); } +#endif #else //void* glGetProc(const char *str) { return glXGetProcAddress((const GLubyte *)str); } #define glGetProc(a) glXGetProcAddress((const GLubyte *)(a))