Ooops, subset patch is supposed to be in subset branch only.

This commit is contained in:
Nigel Stewart 2011-04-23 15:24:04 -05:00
parent a89b304a8c
commit e2dffd8dd7
4 changed files with 1 additions and 22 deletions

View File

@ -30,8 +30,6 @@ if (@ARGV)
foreach my $ext (sort @extlist) foreach my $ext (sort @extlist)
{ {
my ($extname, $exturl, $extstring, $types, $tokens, $functions, $exacts) = parse_ext($ext); my ($extname, $exturl, $extstring, $types, $tokens, $functions, $exacts) = parse_ext($ext);
print "\n#if !defined(GLEW_SUBSET) || defined(GLEW_SUBSET_$extname)\n";
output_decls($functions, \&make_pfn_decl); output_decls($functions, \&make_pfn_decl);
print "\n#endif /* GLEW_SUBSET_$extname */\n";
} }
} }

View File

@ -55,15 +55,12 @@ if (@ARGV)
my ($extname, $exturl, $extstring, $types, $tokens, $functions, $exacts) = parse_ext($ext); my ($extname, $exturl, $extstring, $types, $tokens, $functions, $exacts) = parse_ext($ext);
make_separator($extname); make_separator($extname);
print "#ifndef $extname\n"; print "#ifndef $extname\n#define $extname 1\n";
output_tokens($tokens, \&make_define); output_tokens($tokens, \&make_define);
output_types($types, \&make_type); output_types($types, \&make_type);
output_exacts($exacts, \&make_exact); output_exacts($exacts, \&make_exact);
output_decls($functions, \&make_pfn_type); output_decls($functions, \&make_pfn_type);
print "\n#if !defined(GLEW_SUBSET) || defined(GLEW_SUBSET_$extname)\n";
print "#define $extname 1\n";
output_decls($functions, \&make_pfn_alias); output_decls($functions, \&make_pfn_alias);
print "\n#endif /* GLEW_SUBSET_$extname */\n";
my $extvar = $extname; my $extvar = $extname;
$extvar =~ s/GL(X*)_/GL$1EW_/; $extvar =~ s/GL(X*)_/GL$1EW_/;

View File

@ -31,8 +31,6 @@ if (@ARGV)
foreach my $ext (sort @extlist) foreach my $ext (sort @extlist)
{ {
my ($extname, $exturl, $extstring, $types, $tokens, $functions, $exacts) = parse_ext($ext); my ($extname, $exturl, $extstring, $types, $tokens, $functions, $exacts) = parse_ext($ext);
print "\n#if !defined(GLEW_SUBSET) || defined(GLEW_SUBSET_$extname)\n";
output_decls($functions, \&make_pfn_decl); output_decls($functions, \&make_pfn_decl);
print "\n#endif /* GLEW_SUBSET_$extname */\n";
} }
} }

View File

@ -158,20 +158,6 @@ typedef _W64 int ptrdiff_t;
#endif /* _WIN32 */ #endif /* _WIN32 */
/* GLEW depends on extension string entry points for internal purposes */
#ifdef GLEW_SUBSET
#ifndef GLEW_SUBSET_WGL_ARB_extensions_string
#define GLEW_SUBSET_WGL_ARB_extensions_string
#endif
#ifndef GLEW_SUBSET_WGL_EXT_extensions_string
#define GLEW_SUBSET_WGL_EXT_extensions_string
#endif
#ifndef GLEW_SUBSET_GLX_VERSION_1_2
#define GLEW_SUBSET_GLX_VERSION_1_2
#endif
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif