From 9196bdbd810480d99aacfaa8d747684b54126df1 Mon Sep 17 00:00:00 2001 From: helixhorned Date: Tue, 11 Oct 2011 16:52:53 +0000 Subject: [PATCH] fix osx build: looks like it doesn't have the GL debugging functions git-svn-id: https://svn.eduke32.com/eduke32@2073 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/build/include/glbuild.h | 2 ++ polymer/eduke32/build/src/glbuild.c | 4 ++++ polymer/eduke32/build/src/polymer.c | 2 ++ 3 files changed, 8 insertions(+) diff --git a/polymer/eduke32/build/include/glbuild.h b/polymer/eduke32/build/include/glbuild.h index b92033337..fa02a1d24 100644 --- a/polymer/eduke32/build/include/glbuild.h +++ b/polymer/eduke32/build/include/glbuild.h @@ -284,8 +284,10 @@ extern void (APIENTRY * bglGetActiveAttribARB)(GLhandleARB, GLuint, GLsizei, GLs extern GLint (APIENTRY * bglGetAttribLocationARB)(GLhandleARB, const GLcharARB *); // Debug Output +#ifndef __APPLE__ extern void (APIENTRY * bglDebugMessageControlARB)(GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled); extern void (APIENTRY * bglDebugMessageCallbackARB)(GLDEBUGPROCARB callback, const GLvoid *userParam); +#endif // GLU extern void (APIENTRY * bgluTessBeginContour) (GLUtesselator* tess); diff --git a/polymer/eduke32/build/src/glbuild.c b/polymer/eduke32/build/src/glbuild.c index 1a2448d0d..2073717ec 100644 --- a/polymer/eduke32/build/src/glbuild.c +++ b/polymer/eduke32/build/src/glbuild.c @@ -251,8 +251,10 @@ void (APIENTRY *bglGetActiveAttribARB)(GLhandleARB, GLuint, GLsizei, GLsizei *, GLint(APIENTRY *bglGetAttribLocationARB)(GLhandleARB, const GLcharARB *); // Debug Output +#ifndef __APPLE__ void (APIENTRY * bglDebugMessageControlARB)(GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled); void (APIENTRY * bglDebugMessageCallbackARB)(GLDEBUGPROCARB callback, const GLvoid *userParam); +#endif // GLU void (APIENTRY *bgluTessBeginContour)(GLUtesselator *tess); @@ -621,8 +623,10 @@ int32_t loadglextensions(void) bglGetAttribLocationARB = GETPROCEXTSOFT("glGetAttribLocationARB"); // Debug Output +#ifndef __APPLE__ bglDebugMessageControlARB = GETPROCEXTSOFT("glDebugMessageControlARB"); bglDebugMessageCallbackARB = GETPROCEXTSOFT("glDebugMessageCallbackARB"); +#endif #ifdef RENDERTYPEWIN bwglSwapIntervalEXT = GETPROCEXTSOFT("wglSwapIntervalEXT"); diff --git a/polymer/eduke32/build/src/polymer.c b/polymer/eduke32/build/src/polymer.c index ab6f87e1c..b783def86 100644 --- a/polymer/eduke32/build/src/polymer.c +++ b/polymer/eduke32/build/src/polymer.c @@ -730,11 +730,13 @@ int32_t polymer_init(void) i++; } +#ifndef __APPLE__ if (glinfo.debugoutput) { // Enable everything. bglDebugMessageControlARB(GL_DONT_CARE, GL_DONT_CARE, GL_DONT_CARE, 0, NULL, GL_TRUE); bglDebugMessageCallbackARB(polymer_debugoutputcallback, NULL); } +#endif if (pr_verbosity >= 1) OSD_Printf("PR : Initialization complete in %d ms.\n", getticks()-t);