[GEM-cvs] Gem/src/Base glew.cpp, 1.2, 1.3 glew.h, 1.1, 1.2 glxew.h, 1.1, 1.2 wglew.h, 1.1, 1.2
Brought to you by:
zmoelnig
Menu
▾
▴
[GEM-cvs] Gem/src/Base glew.cpp, 1.2, 1.3 glew.h, 1.1, 1.2 glxew.h, 1.1, 1.2 wglew.h, 1.1, 1.2
|
From: IOhannes m z. <zmo...@us...> - 2006-09-25 14:15:29
|
Update of /cvsroot/pd-gem/Gem/src/Base In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31588/Base Modified Files: glew.cpp glew.h glxew.h wglew.h Log Message: regenerated glew from 1.3.4 sources; fixed importGLEW.sh so that it automatically adds the "#ifdef USE_GLEW" clauses around the code Index: glew.cpp =================================================================== RCS file: /cvsroot/pd-gem/Gem/src/Base/glew.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** glew.cpp 21 Feb 2006 11:02:12 -0000 1.2 --- glew.cpp 25 Sep 2006 13:28:17 -0000 1.3 *************** *** 1,6 **** /* ** The OpenGL Extension Wrangler Library ! ** Copyright (C) 2002-2005, Milan Ikits <milan ikits[]ieee org> ! ** Copyright (C) 2002-2005, Marcelo E. Magallon <mmagallo[]debian org> ** Copyright (C) 2002, Lev Povalahev ** All rights reserved. --- 1,8 ---- + #include "Base/config.h" + #ifdef USE_GLEW /* ** The OpenGL Extension Wrangler Library ! ** Copyright (C) 2002-2006, Milan Ikits <milan ikits[]ieee org> ! ** Copyright (C) 2002-2006, Marcelo E. Magallon <mmagallo[]debian org> ** Copyright (C) 2002, Lev Povalahev ** All rights reserved. *************** *** 30,36 **** */ - #include "Base/config.h" - #ifdef USE_GLEW - #include "Base/glew.h" #if defined(_WIN32) --- 32,35 ---- *************** *** 2116,2119 **** --- 2115,2119 ---- GLboolean r = GL_FALSE; + r = ((glBlendEquation = (PFNGLBLENDEQUATIONPROC)glewGetProcAddress((const GLubyte*)"glBlendEquation")) == NULL) || r; r = ((glColorSubTable = (PFNGLCOLORSUBTABLEPROC)glewGetProcAddress((const GLubyte*)"glColorSubTable")) == NULL) || r; r = ((glColorTable = (PFNGLCOLORTABLEPROC)glewGetProcAddress((const GLubyte*)"glColorTable")) == NULL) || r; *************** *** 7161,7165 **** { (const GLubyte*)NULL, ! (const GLubyte*)"1.3.3" }; const int max_string = sizeof(_glewString)/sizeof(*_glewString) - 1; --- 7161,7165 ---- { (const GLubyte*)NULL, ! (const GLubyte*)"1.3.4" }; const int max_string = sizeof(_glewString)/sizeof(*_glewString) - 1; *************** *** 9753,9757 **** #endif /* _WIN32 */ - - #endif /* USE_GLEW */ --- 9753,9755 ---- Index: glxew.h =================================================================== RCS file: /cvsroot/pd-gem/Gem/src/Base/glxew.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** glxew.h 26 Jan 2006 14:07:06 -0000 1.1 --- glxew.h 25 Sep 2006 13:28:17 -0000 1.2 *************** *** 1,6 **** /* ** The OpenGL Extension Wrangler Library ! ** Copyright (C) 2002-2005, Milan Ikits <milan ikits[]ieee org> ! ** Copyright (C) 2002-2005, Marcelo E. Magallon <mmagallo[]debian org> ** Copyright (C) 2002, Lev Povalahev ** All rights reserved. --- 1,6 ---- /* ** The OpenGL Extension Wrangler Library ! ** Copyright (C) 2002-2006, Milan Ikits <milan ikits[]ieee org> ! ** Copyright (C) 2002-2006, Marcelo E. Magallon <mmagallo[]debian org> ** Copyright (C) 2002, Lev Povalahev ** All rights reserved. Index: wglew.h =================================================================== RCS file: /cvsroot/pd-gem/Gem/src/Base/wglew.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wglew.h 26 Jan 2006 14:07:06 -0000 1.1 --- wglew.h 25 Sep 2006 13:28:17 -0000 1.2 *************** *** 1,6 **** /* ** The OpenGL Extension Wrangler Library ! ** Copyright (C) 2002-2005, Milan Ikits <milan ikits[]ieee org> ! ** Copyright (C) 2002-2005, Marcelo E. Magallon <mmagallo[]debian org> ** Copyright (C) 2002, Lev Povalahev ** All rights reserved. --- 1,6 ---- /* ** The OpenGL Extension Wrangler Library ! ** Copyright (C) 2002-2006, Milan Ikits <milan ikits[]ieee org> ! ** Copyright (C) 2002-2006, Marcelo E. Magallon <mmagallo[]debian org> ** Copyright (C) 2002, Lev Povalahev ** All rights reserved. *************** *** 41,45 **** #if !defined(APIENTRY) && !defined(__CYGWIN__) ! #define WIN32_LEAN_AND_MEAN 1 #include <windows.h> #endif --- 41,47 ---- #if !defined(APIENTRY) && !defined(__CYGWIN__) ! # ifndef WIN32_LEAN_AND_MEAN ! # define WIN32_LEAN_AND_MEAN 1 ! # endif #include <windows.h> #endif Index: glew.h =================================================================== RCS file: /cvsroot/pd-gem/Gem/src/Base/glew.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** glew.h 26 Jan 2006 14:07:05 -0000 1.1 --- glew.h 25 Sep 2006 13:28:17 -0000 1.2 *************** *** 1,6 **** /* ** The OpenGL Extension Wrangler Library ! ** Copyright (C) 2002-2005, Milan Ikits <milan ikits[]ieee org> ! ** Copyright (C) 2002-2005, Marcelo E. Magallon <mmagallo[]debian org> ** Copyright (C) 2002, Lev Povalahev ** All rights reserved. --- 1,6 ---- /* ** The OpenGL Extension Wrangler Library ! ** Copyright (C) 2002-2006, Milan Ikits <milan ikits[]ieee org> ! ** Copyright (C) 2002-2006, Marcelo E. Magallon <mmagallo[]debian org> ** Copyright (C) 2002, Lev Povalahev ** All rights reserved. *************** *** 79,83 **** #define __gl_ATI_h_ ! #if defined(_WIN32) /* --- 79,83 ---- #define __gl_ATI_h_ ! #if defined(_WIN32) || defined(__CYGWIN__) || defined(__MINGW32__) /* *************** *** 203,216 **** #define GL_VERSION_1_1 1 typedef unsigned int GLenum; - typedef unsigned char GLboolean; typedef unsigned int GLbitfield; ! typedef signed char GLbyte; ! typedef short GLshort; typedef int GLint; typedef int GLsizei; typedef unsigned char GLubyte; typedef unsigned short GLushort; - typedef unsigned int GLuint; typedef float GLfloat; typedef float GLclampf; --- 203,224 ---- #define GL_VERSION_1_1 1 + #if defined(__APPLE__) + typedef unsigned long GLenum; + typedef unsigned long GLbitfield; + typedef unsigned long GLuint; + typedef long GLint; + typedef long GLsizei; + #else typedef unsigned int GLenum; typedef unsigned int GLbitfield; ! typedef unsigned int GLuint; typedef int GLint; typedef int GLsizei; + #endif + typedef unsigned char GLboolean; + typedef signed char GLbyte; + typedef short GLshort; typedef unsigned char GLubyte; typedef unsigned short GLushort; typedef float GLfloat; typedef float GLclampf; |