*** empty log message ***

git-svn-id: https://glew.svn.sourceforge.net/svnroot/glew/trunk/glew@152 783a27ee-832a-0410-bc00-9f386506c6dd
This commit is contained in:
ikits 2003-10-27 02:34:05 +00:00
parent 36a15420dc
commit d8f5c71357
7 changed files with 19 additions and 25 deletions

View File

@ -38,12 +38,15 @@ foreach my $ext (sort @extlist)
{ {
my ($extname, $exturl, $types, $tokens, $functions, $exacts) = parse_ext($ext); my ($extname, $exturl, $types, $tokens, $functions, $exacts) = parse_ext($ext);
my $extvar = $extname; my $extvar = $extname;
my $extvardef = $extname;
$extvar =~ s/GL(X*)_/GL$1EW_/; $extvar =~ s/GL(X*)_/GL$1EW_/;
my $extpre = $extname;
$extpre =~ s/(GLX|GLW|GL).*/$1/;
$extpre = lc $extpre;
make_separator($extname); make_separator($extname);
print "#ifdef $extname\n\n"; print "#ifdef $extname\n\n";
print "static void _glewInfo_$extname (void)\n{\n glewPrintExt(\"$extname\", $extvar);\n"; print "static void _glewInfo_$extname (void)\n{\n";
print " glewPrintExt(\"$extname\", $extvar, $extpre" . "ewGetExtension(\"$extname\"));\n";
output_decls($functions, \&make_pfn_info); output_decls($functions, \&make_pfn_info);
print "}\n\n"; print "}\n\n";
print "#endif /* $extname */\n\n"; print "#endif /* $extname */\n\n";

View File

@ -30,19 +30,19 @@
*/ */
#include <GL/glew.h> #include <GL/glew.h>
#ifdef _WIN32 #if defined(_WIN32)
#include <GL/wglew.h> # include <GL/wglew.h>
#else #elif !defined(__APPLE__) || defined(GLEW_APPLE_GLX)
#include <GL/glxew.h> # include <GL/glxew.h>
#endif #endif
#ifdef _WIN32 #if defined(_WIN32)
# define glewGetProcAddress(name) wglGetProcAddress(name) # define glewGetProcAddress(name) wglGetProcAddress(name)
#else #else
# ifdef __APPLE__ # if defined(__APPLE__)
# define glewGetProcAddress(name) NSGLGetProcAddress(name) # define glewGetProcAddress(name) NSGLGetProcAddress(name)
# else # else
# ifdef __sgi # if defined(__sgi)
# define glewGetProcAddress(name) dlGetProcAddress(name) # define glewGetProcAddress(name) dlGetProcAddress(name)
# else /* __linux */ # else /* __linux */
# define glewGetProcAddress(name) (*glXGetProcAddressARB)(name) # define glewGetProcAddress(name) (*glXGetProcAddressARB)(name)
@ -50,7 +50,7 @@
# endif # endif
#endif #endif
#ifdef __APPLE__ #if defined(__APPLE__)
#include <mach-o/dyld.h> #include <mach-o/dyld.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -71,7 +71,7 @@ static void* NSGLGetProcAddress (const char* name)
} }
#endif /* __APPLE__ */ #endif /* __APPLE__ */
#ifdef __sgi #if defined(__sgi)
#include <dlfcn.h> #include <dlfcn.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>

View File

@ -32,11 +32,10 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <GL/glew.h> #include <GL/glew.h>
#if defined(_WIN32)
#include <GL/wglew.h> #include <GL/wglew.h>
#elif !defined(__APPLE__) || defined(GLEW_APPLE_GLX)
#include <GL/glxew.h> #include <GL/glxew.h>
#ifdef _WIN32
#include <windows.h>
#endif #endif
static FILE* f; static FILE* f;
@ -46,12 +45,12 @@ void glewDestroyContext ();
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
static void glewPrintExt (const GLubyte* name, GLint defined) static void glewPrintExt (const GLubyte* name, GLint def1, GLint def2)
{ {
unsigned int i; unsigned int i;
fprintf(f, "\n%s:", name); fprintf(f, "\n%s:", name);
for (i=0; i<62-strlen((const char*)name); i++) fprintf(f, " "); for (i=0; i<62-strlen((const char*)name); i++) fprintf(f, " ");
fprintf(f, "%s\n", defined ? "OK" : "MISSING"); fprintf(f, "%s [%s]\n", def1 ? "OK" : "MISSING", def2 ? "OK" : "MISSING");
for (i=0; i<strlen((const char*)name)+1; i++) fprintf(f, "-"); for (i=0; i<strlen((const char*)name)+1; i++) fprintf(f, "-");
fprintf(f, "\n"); fprintf(f, "\n");
fflush(f); fflush(f);
@ -72,7 +71,7 @@ static void glewInfoFunc (const GLubyte* name, GLint undefined)
static void _glewInfo_GL_VERSION_1_1 (void) static void _glewInfo_GL_VERSION_1_1 (void)
{ {
glewPrintExt("GL_VERSION_1_1", GLEW_VERSION_1_1); glewPrintExt("GL_VERSION_1_1", GLEW_VERSION_1_1, glewGetExtension("GL_VERSION_1_1"));
} }
#endif /* GL_VERSION_1_1 */ #endif /* GL_VERSION_1_1 */

View File

@ -6,6 +6,4 @@ extern GLboolean glxewGetExtension (const GLubyte* name);
} }
#endif #endif
#endif /* _WIN32 */
#endif /* __glxew_h__ */ #endif /* __glxew_h__ */

View File

@ -58,8 +58,6 @@
#define __glxext_h_ #define __glxext_h_
#ifndef _WIN32
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>
#include <X11/Xmd.h> #include <X11/Xmd.h>

View File

@ -8,6 +8,4 @@ GLEWAPI GLboolean wglewGetExtension (const GLubyte* name);
#undef GLEWAPI #undef GLEWAPI
#endif /* _WIN32 */
#endif /* __wglew_h__ */ #endif /* __wglew_h__ */

View File

@ -68,8 +68,6 @@
#define __wglext_h_ #define __wglext_h_
#ifdef _WIN32
#if !defined(APIENTRY) && !defined(__CYGWIN__) #if !defined(APIENTRY) && !defined(__CYGWIN__)
#define WIN32_LEAN_AND_MEAN 1 #define WIN32_LEAN_AND_MEAN 1
#include <windows.h> #include <windows.h>