removed WGL_{ARB,EXT}_extensions_string dependency

git-svn-id: https://glew.svn.sourceforge.net/svnroot/glew/trunk/glew@120 783a27ee-832a-0410-bc00-9f386506c6dd
This commit is contained in:
ikits 2003-09-15 15:35:32 +00:00
parent 56a43c3f50
commit cd64fd9607
4 changed files with 11 additions and 6 deletions

View File

@ -13,6 +13,7 @@ GLEW_VERSION = $(GLEW_MAJOR).$(GLEW_MINOR).$(GLEW_MICRO)
SHELL = bash SHELL = bash
REGISTRY = registry REGISTRY = registry
REGISTRY_URL = http://oss.sgi.com/projects/ogl-sample/registry/
BIN = bin BIN = bin
SRC = src SRC = src
CORE = core CORE = core
@ -26,18 +27,21 @@ I.DEST = $(TOP)/include/GL
S.DEST = $(TOP)/src S.DEST = $(TOP)/src
D.DEST = $(TOP)/doc D.DEST = $(TOP)/doc
TARGETS = $(I.DEST)/glew.h $(I.DEST)/wglew.h $(I.DEST)/glxew.h $(S.DEST)/glew.c $(S.DEST)/glewinfo.c $(D.DEST)/glew.html $(D.DEST)/wglew.html $(D.DEST)/glxew.html TARGETS = $(I.DEST)/glew.h $(I.DEST)/wglew.h $(I.DEST)/glxew.h $(S.DEST)/glew.c $(S.DEST)/glewinfo.c \
$(D.DEST)/glew.html $(D.DEST)/wglew.html $(D.DEST)/glxew.html
all: $(TARGETS) all: $(TARGETS)
registry: $(REGISTRY)/.dummy
ext: $(EXT)/.dummy ext: $(EXT)/.dummy
$(REGISTRY)/.dummy: $(BIN)/update_registry.sh $(REGISTRY)/.dummy: $(BIN)/update_registry.sh
$(BIN)/update_registry.sh $(REGISTRY) $(BIN)/update_registry.sh $(REGISTRY) $(REGISTRY_URL)
sed -i -e '7s/\<ATI_/GL_ATI_/' $(REGISTRY)/ATI/texture_env_combine3.txt
touch $@ touch $@
$(EXT)/.dummy: $(REGISTRY)/.dummy $(EXT)/.dummy: $(REGISTRY)/.dummy
rm -r -f $(EXT) rm -rf $(EXT)
$(BIN)/update_ext.sh $(EXT) $(REGISTRY) $(BLACKLIST) $(BIN)/update_ext.sh $(EXT) $(REGISTRY) $(BLACKLIST)
find $(CORE) -maxdepth 1 -type f | grep -v VERSION | xargs cp --target-directory=$(EXT) find $(CORE) -maxdepth 1 -type f | grep -v VERSION | xargs cp --target-directory=$(EXT)
touch $@ touch $@

View File

@ -56,7 +56,7 @@ foreach my $ext (sort @extlist)
{ {
if ($extname =~ /WGL_.*/) if ($extname =~ /WGL_.*/)
{ {
print " if (glewExperimental || $extvar || (!WGLEW_EXT_extensions_string && !WGLEW_ARB_extensions_string)) $extvar = !_glewInit_$extname();\n"; print " if (glewExperimental || $extvar || crippled) $extvar = !_glewInit_$extname();\n";
} }
else else
{ {

View File

@ -20,6 +20,5 @@ wget \
--no-host-directories \ --no-host-directories \
--cut-dirs=3 \ --cut-dirs=3 \
--accept=txt,html \ --accept=txt,html \
http://oss.sgi.com/projects/ogl-sample/registry/ $2
sed -i -e '7s/\<ATI_/GL_ATI_/' ATI/texture_env_combine3.txt

View File

@ -29,9 +29,11 @@ GLboolean wglewGetExtension (const char *name)
static GLuint _wglewInit () static GLuint _wglewInit ()
{ {
GLboolean crippled;
/* find wgl extension string query functions */ /* find wgl extension string query functions */
_glewInit_WGL_ARB_extensions_string(); _glewInit_WGL_ARB_extensions_string();
WGLEW_ARB_extensions_string = wglGetExtensionsStringARB != NULL; WGLEW_ARB_extensions_string = wglGetExtensionsStringARB != NULL;
_glewInit_WGL_EXT_extensions_string(); _glewInit_WGL_EXT_extensions_string();
WGLEW_EXT_extensions_string = wglGetExtensionsStringEXT != NULL; WGLEW_EXT_extensions_string = wglGetExtensionsStringEXT != NULL;
/* initialize extensions */ /* initialize extensions */
crippled = !(WGLEW_ARB_extensions_string || WGLEW_EXT_extensions_string);