From e2dffd8dd772de9edc547904195bd53d96b8a013 Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Sat, 23 Apr 2011 15:24:04 -0500 Subject: [PATCH] Ooops, subset patch is supposed to be in subset branch only. --- auto/bin/make_def_fun.pl | 2 -- auto/bin/make_header.pl | 5 +---- auto/bin/make_struct_fun.pl | 2 -- auto/src/glew_head.h | 14 -------------- 4 files changed, 1 insertion(+), 22 deletions(-) diff --git a/auto/bin/make_def_fun.pl b/auto/bin/make_def_fun.pl index d6915e8..40e67d5 100755 --- a/auto/bin/make_def_fun.pl +++ b/auto/bin/make_def_fun.pl @@ -30,8 +30,6 @@ if (@ARGV) foreach my $ext (sort @extlist) { 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); - print "\n#endif /* GLEW_SUBSET_$extname */\n"; } } diff --git a/auto/bin/make_header.pl b/auto/bin/make_header.pl index 5ee101a..934ef77 100755 --- a/auto/bin/make_header.pl +++ b/auto/bin/make_header.pl @@ -55,15 +55,12 @@ if (@ARGV) my ($extname, $exturl, $extstring, $types, $tokens, $functions, $exacts) = parse_ext($ext); make_separator($extname); - print "#ifndef $extname\n"; + print "#ifndef $extname\n#define $extname 1\n"; output_tokens($tokens, \&make_define); output_types($types, \&make_type); output_exacts($exacts, \&make_exact); 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); - print "\n#endif /* GLEW_SUBSET_$extname */\n"; my $extvar = $extname; $extvar =~ s/GL(X*)_/GL$1EW_/; diff --git a/auto/bin/make_struct_fun.pl b/auto/bin/make_struct_fun.pl index 139ad18..c885960 100755 --- a/auto/bin/make_struct_fun.pl +++ b/auto/bin/make_struct_fun.pl @@ -31,8 +31,6 @@ if (@ARGV) foreach my $ext (sort @extlist) { 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); - print "\n#endif /* GLEW_SUBSET_$extname */\n"; } } diff --git a/auto/src/glew_head.h b/auto/src/glew_head.h index e54d640..26b8808 100644 --- a/auto/src/glew_head.h +++ b/auto/src/glew_head.h @@ -158,20 +158,6 @@ typedef _W64 int ptrdiff_t; #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 extern "C" { #endif