Commit 14e21240 authored by Nigel Stewart's avatar Nigel Stewart
Browse files

Fix Issue #195 - need to sort extensions by name, rather than path

parent bc3c5d49
...@@ -193,7 +193,7 @@ $(S.DEST)/glew.c: $(EXT)/.dummy ...@@ -193,7 +193,7 @@ $(S.DEST)/glew.c: $(EXT)/.dummy
$(BIN)/make_def_var.pl GL $(GL_EXT_SPEC) >> $@ $(BIN)/make_def_var.pl GL $(GL_EXT_SPEC) >> $@
echo -e "\nstatic const char * _glewExtensionLookup[] = {" >> $@; echo -e "\nstatic const char * _glewExtensionLookup[] = {" >> $@;
$(BIN)/make_index.pl $(GL_CORE_SPEC) $(GL_EXT_SPEC) >> $@ $(BIN)/make_index.pl $(GL_CORE_SPEC) $(GL_EXT_SPEC) >> $@
echo -e " NULL\n};\n" >> $@; echo -e " NULL\n};\n\n" >> $@;
$(BIN)/make_enable_index.pl $(GL_CORE_SPEC) $(GL_EXT_SPEC) >> $@ $(BIN)/make_enable_index.pl $(GL_CORE_SPEC) $(GL_EXT_SPEC) >> $@
$(BIN)/make_initd.pl GL $(GL_CORE_SPEC) >> $@ $(BIN)/make_initd.pl GL $(GL_CORE_SPEC) >> $@
$(BIN)/make_initd.pl GL $(GL_EXT_SPEC) >> $@ $(BIN)/make_initd.pl GL $(GL_EXT_SPEC) >> $@
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
use strict; use strict;
use warnings; use warnings;
use File::Basename;
use lib '.'; use lib '.';
do 'bin/make.pl'; do 'bin/make.pl';
...@@ -29,7 +30,7 @@ if (@ARGV) ...@@ -29,7 +30,7 @@ if (@ARGV)
print "/* Detected via extension string or experimental mode */\n"; print "/* Detected via extension string or experimental mode */\n";
print "static GLboolean* _glewExtensionEnabled[] = {\n";; print "static GLboolean* _glewExtensionEnabled[] = {\n";;
foreach my $ext (sort @extlist) foreach my $ext (sort { basename($a) cmp basename($b) } @extlist)
{ {
my ($extname, $exturl, $extstring, $reuse, $types, $tokens, $functions, $exacts) = my ($extname, $exturl, $extstring, $reuse, $types, $tokens, $functions, $exacts) =
parse_ext($ext); parse_ext($ext);
...@@ -42,5 +43,5 @@ if (@ARGV) ...@@ -42,5 +43,5 @@ if (@ARGV)
print "#endif\n"; print "#endif\n";
} }
print " NULL\n};\n"; print " NULL\n};\n\n";
} }
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
use strict; use strict;
use warnings; use warnings;
use File::Basename;
use lib '.'; use lib '.';
do 'bin/make.pl'; do 'bin/make.pl';
...@@ -27,7 +28,7 @@ if (@ARGV) ...@@ -27,7 +28,7 @@ if (@ARGV)
{ {
@extlist = @ARGV; @extlist = @ARGV;
foreach my $ext (sort @extlist) foreach my $ext (sort { basename($a) cmp basename($b) } @extlist)
{ {
my ($extname, $exturl, $extstring, $reuse, $types, $tokens, $functions, $exacts) = my ($extname, $exturl, $extstring, $reuse, $types, $tokens, $functions, $exacts) =
parse_ext($ext); parse_ext($ext);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment