| @@ -100,12 +100,12 @@ PKG_CHECK_MODULES(GLEW, glew, | |||||
| GL_CFLAGS="${GLEW_CFLAGS} ${GL_CFLAGS}" | GL_CFLAGS="${GLEW_CFLAGS} ${GL_CFLAGS}" | ||||
| GL_LIBS="${GLEW_LIBS} ${GL_LIBS}"], | GL_LIBS="${GLEW_LIBS} ${GL_LIBS}"], | ||||
| [:]) | [:]) | ||||
| AC_CHECK_HEADER(glew.h, | |||||
| AC_CHECK_HEADER(GL/glew.h, | |||||
| [LIBS_save="${LIBS}" | [LIBS_save="${LIBS}" | ||||
| LIBS="${LIBS} -lglew32s ${GL_LIBS}" | LIBS="${LIBS} -lglew32s ${GL_LIBS}" | ||||
| AC_MSG_CHECKING(for glewInit in -lglew32s) | AC_MSG_CHECKING(for glewInit in -lglew32s) | ||||
| AC_TRY_LINK( | AC_TRY_LINK( | ||||
| [#include <glew.h>], | |||||
| [#include <GL/glew.h>], | |||||
| [glewInit();], | [glewInit();], | ||||
| [ac_cv_my_have_glew="yes" | [ac_cv_my_have_glew="yes" | ||||
| GL_LIBS="-lglew32s ${GL_LIBS}" | GL_LIBS="-lglew32s ${GL_LIBS}" | ||||
| @@ -71,7 +71,7 @@ | |||||
| <!-- OpenGL & GLEW --> | <!-- OpenGL & GLEW --> | ||||
| <GlewDir>$(ExternalDir)\glew-1.9.0</GlewDir> | <GlewDir>$(ExternalDir)\glew-1.9.0</GlewDir> | ||||
| <GlIncludes>$(GlewDir)\include\GL</GlIncludes> | |||||
| <GlIncludes>$(GlewDir)\include</GlIncludes> | |||||
| <GlLibs Condition="'$(Platform)'=='Win32'">$(GlewDir)\lib\i686-w64-mingw32</GlLibs> | <GlLibs Condition="'$(Platform)'=='Win32'">$(GlewDir)\lib\i686-w64-mingw32</GlLibs> | ||||
| <GlLibs Condition="'$(Platform)'=='x64'">$(GlewDir)\lib\x86_64-w64-mingw32</GlLibs> | <GlLibs Condition="'$(Platform)'=='x64'">$(GlewDir)\lib\x86_64-w64-mingw32</GlLibs> | ||||
| <GlDeps Condition="'$(Platform)'=='Win32'">opengl32.lib;glew32s.lib</GlDeps> | <GlDeps Condition="'$(Platform)'=='Win32'">opengl32.lib;glew32s.lib</GlDeps> | ||||
| @@ -31,7 +31,7 @@ | |||||
| * Do not include glew.h on OS X, because the version shipped with Fink | * Do not include glew.h on OS X, because the version shipped with Fink | ||||
| * links with X11 whereas we want the system’s Cocoa-friendly GL libs. */ | * links with X11 whereas we want the system’s Cocoa-friendly GL libs. */ | ||||
| #if defined USE_GLEW && !defined __APPLE__ | #if defined USE_GLEW && !defined __APPLE__ | ||||
| # include <glew.h> | |||||
| # include <GL/glew.h> | |||||
| #elif defined HAVE_GL_2X | #elif defined HAVE_GL_2X | ||||
| # if defined __APPLE__ && defined __MACH__ && defined __arm__ | # if defined __APPLE__ && defined __MACH__ && defined __arm__ | ||||
| # include <OpenGL/gl.h> | # include <OpenGL/gl.h> | ||||