Zengtudor/glew-cmake
1
0
Fork 0
mirror of https://github.com/Perlmint/glew-cmake.git synced 2024-11-27 00:51:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

*** empty log message ***

Browse Source 
git-svn-id: https://glew.svn.sourceforge.net/svnroot/glew/trunk/glew@54 783a27ee-832a-0410-bc00-9f386506c6dd
This commit is contained in:
ikits 2003-05-01 20:02:23 +00:00
parent 9fbb09d411
commit 38fbb8e02f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -69,7 +69,7 @@ BIN.SRCS = src/glewinfo.c
BIN.OBJS = $(BIN.SRCS:.c=.o) BIN.OBJS = $(BIN.SRCS:.c=.o)
BIN.LIBS = -Llib -L/usr/X11R6/lib -lglut -l$(NAME) -lGLU -lGL -lXmu -lX11 BIN.LIBS = -Llib -L/usr/X11R6/lib -lglut -l$(NAME) -lGLU -lGL -lXmu -lX11
all: lib/$(LIB.A) bin/$(BIN) all: lib/$(LIB.A) lib/$(LIB.SO) bin/$(BIN)
lib/$(LIB.A): $(LIB.OBJS) lib/$(LIB.A): $(LIB.OBJS)
$(AR) cr $@ $^ $(AR) cr $@ $^

4
src/glew.c
View File

@ -3265,7 +3265,7 @@ GLboolean glxewGetExtension (const char *name)
{ {
char *p, *end; char *p, *end;
int len = _glewStrLen(name); int len = _glewStrLen(name);
if (glXQueryExtensionsString == NULL) return GL_FALSE; if (glXQueryExtensionsString == NULL || glXGetCurrentDisplay == NULL) return GL_FALSE;
p = (char*)glXQueryExtensionsString(glXGetCurrentDisplay(), DefaultScreen(glXGetCurrentDisplay())); p = (char*)glXQueryExtensionsString(glXGetCurrentDisplay(), DefaultScreen(glXGetCurrentDisplay()));
if (0 == p) return GL_FALSE; if (0 == p) return GL_FALSE;
end = p + _glewStrLen(p); end = p + _glewStrLen(p);
@ -3284,7 +3284,7 @@ static GLint _glxewInit ()
/* intialize glxew struct */ /* intialize glxew struct */
_glewMemSet(&glxew, 0, sizeof(glxew)); _glewMemSet(&glxew, 0, sizeof(glxew));
/* initialize core GLX 1.0-1.2 */ /* initialize core GLX 1.0-1.2 */
if (_glxewInit_10() || _glxewInit_11() || _glxewInit_12()) return GLEW_ERROR_GLX_VERSION_11_ONLY; if (_glxewInit_10() || _glxewInit_11() || _glxewInit_12() || glXGetCurrentDisplay == NULL) return GLEW_ERROR_GLX_VERSION_11_ONLY;
/* query GLX version */ /* query GLX version */
glXQueryVersion(glXGetCurrentDisplay(), &major, &minor); glXQueryVersion(glXGetCurrentDisplay(), &major, &minor);
switch (minor) switch (minor)