diff --git a/configure.ac b/configure.ac index 11c5a42c..caed5313 100644 --- a/configure.ac +++ b/configure.ac @@ -112,6 +112,12 @@ PKG_CHECK_MODULES(GLES2, glesv2, GL_CFLAGS="${GL_CFLAGS} ${GLES2_CFLAGS}" GL_LIBS="${GL_LIBS} ${GLES2_LIBS}"], [:]) + +PKG_CHECK_MODULES(GL, gl, + [ac_cv_my_have_gl="yes" + AC_DEFINE(HAVE_GL_2X, 1, Define to 1 if GL 2.x is available)], + [:]) + AC_CHECK_LIB(GL, glLoadIdentity, [ac_cv_my_have_gl="yes" AC_DEFINE(HAVE_GL_2X, 1, Define to 1 if GL 2.x is available) # FIXME: hackish diff --git a/src/debug/quad.cpp b/src/debug/quad.cpp index 625a5679..993e6423 100644 --- a/src/debug/quad.cpp +++ b/src/debug/quad.cpp @@ -1082,13 +1082,13 @@ void DebugQuad::ResetState() #if defined HAVE_GLBEGIN || defined USE_GLEW || defined __CELLOS_LV2__ glClientActiveTexture(GL_TEXTURE0); #endif -#if !defined __CELLOS_LV2__ && !defined __ANDROID__ +#if !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__ glTexEnvi(GL_POINT_SPRITE, GL_COORD_REPLACE, GL_FALSE); #endif glDisable(GL_TEXTURE_2D); glDisable(GL_BLEND); -#if !defined __CELLOS_LV2__ && !defined __ANDROID__ +#if !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__ glDisable(GL_POINT_SPRITE); #endif @@ -1100,7 +1100,7 @@ void DebugQuad::ResetState() cgGLDisableProfile(cgGLGetLatestProfile(CG_GL_FRAGMENT)); #endif -#if !defined __CELLOS_LV2__ && !defined __ANDROID__ +#if !defined __CELLOS_LV2__ && !defined __ANDROID__ && !defined __APPLE__ glDisable(GL_VERTEX_PROGRAM_POINT_SIZE); #endif }