From 5b254ad20a026f0f95a4e9ca6a43bd648d2c3738 Mon Sep 17 00:00:00 2001 From: ikits Date: Thu, 5 Feb 2004 23:14:59 +0000 Subject: [PATCH] *** empty log message *** git-svn-id: https://glew.svn.sourceforge.net/svnroot/glew/trunk/glew@226 783a27ee-832a-0410-bc00-9f386506c6dd --- TODO.txt | 1 + auto/Makefile | 14 ++++---------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/TODO.txt b/TODO.txt index a71e7ee..55e0f7e 100644 --- a/TODO.txt +++ b/TODO.txt @@ -1,3 +1,4 @@ +make auto/Makefile more robust against auto/core/*~ mistakes separate build of static and shared object files web page and documentation update web poll on separating glew, glxew and wglew diff --git a/auto/Makefile b/auto/Makefile index 345860f..a8d1655 100644 --- a/auto/Makefile +++ b/auto/Makefile @@ -1,4 +1,3 @@ - ## ## Copyright (C) 2004, 2003 Marcelo E. Magallon ## Copyright (C) 2004, 2003 Milan Ikits @@ -49,20 +48,18 @@ $(EXT)/.dummy: $(REGISTRY)/.dummy rm -rf $(EXT) $(BIN)/update_ext.sh $(EXT) $(REGISTRY) $(BLACKLIST) ifeq ($(patsubst Darwin%,Darwin,$(SYSTEM)), Darwin) - find $(CORE) -maxdepth 1 -type f | grep -v VERSION | xargs -J % cp % $(EXT) + find $(CORE) -maxdepth 1 -type f | grep -v VERSION | grep -v "~" | \ + xargs -J % cp % $(EXT) else - find $(CORE) -maxdepth 1 -type f | grep -v VERSION | xargs cp --target-directory=$(EXT) + find $(CORE) -maxdepth 1 -type f | grep -v VERSION | grep -v "~" | \ + xargs cp --target-directory=$(EXT) endif touch $@ - $(I.DEST)/glew.h: $(EXT)/.dummy test -d $(I.DEST) || mkdir -p $(I.DEST) cp -f $(SRC)/glew_pre.h $@ $(BIN)/make_header.pl GLAPIENTRY GL $(CORE)/GL_VERSION* >> $@ -# mv $@ tmp; grep -v 'PFNGLBLENDCOLORPROC' tmp | \ -# grep -v 'PFNGLBLENDEQUATIONPROC' | grep -v 'glBlendColor' | \ -# grep -v 'glBlendEquation' > $@; rm tmp; $(BIN)/make_header.pl GLAPIENTRY GL $(EXT)/GL_* >> $@ $(BIN)/make_struct.pl GL $(CORE)/GL_VERSION* $(EXT)/GL_* >> $@ perl -e 's/ GLboolean __GLEW_VERSION_1_2;/ GLboolean __GLEW_VERSION_1_1;\n GLboolean __GLEW_VERSION_1_2;/' -pi.bak $@ @@ -87,9 +84,6 @@ $(I.DEST)/glxew.h: $(EXT)/.dummy $(S.DEST)/glew.c: $(EXT)/.dummy cp -f $(SRC)/glew_pre.c $@ $(BIN)/make_init.pl GL $(CORE)/GL_VERSION* >> $@ -# mv $@ tmp; grep -v 'PFNGLBLENDCOLORPROC' tmp | \ -# grep -v 'PFNGLBLENDEQUATIONPROC' | grep -v 'glBlendColor' | \ -# grep -v 'glBlendEquation' > $@; rm tmp; $(BIN)/make_init.pl GL $(EXT)/GL_* >> $@ echo -e "#ifdef _WIN32\n" >> $@ $(BIN)/make_init.pl WGL $(EXT)/WGL_* >> $@