[Gzz-commits] gzz/gfx libcallgl/Makefile libglwrapper/Makefil...

[Matti Katila]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Matti Katila <address@hidden>   02/10/09 09:39:40

Modified files:
        gfx/libcallgl  : Makefile 
        gfx/libglwrapper: Makefile 
Added files:
        gfx/libcallgl  : gltokens.c 

Log message:
        added static gltokens.c

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libcallgl/gltokens.c?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libcallgl/Makefile.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libglwrapper/Makefile.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: gzz/gfx/libcallgl/Makefile
diff -c gzz/gfx/libcallgl/Makefile:1.10 gzz/gfx/libcallgl/Makefile:1.11
*** gzz/gfx/libcallgl/Makefile:1.10     Thu Oct  3 11:11:27 2002
--- gzz/gfx/libcallgl/Makefile  Wed Oct  9 09:39:39 2002
***************
*** 11,18 ****
  calltest: $(CTOBJS)
        $(CXX) $(CTOBJS) -o calltest -lglut -lGL -lGLU
  
! callgl.cxx: gltokens.c 
  
  # XXX Make it check whether the user has the nvidia include file...
  gltokens.c: Makefile /usr/include/GL/gl.h /usr/include/GL/glext.h
        grep -h '#define GL_\w\+[[:space:]]\+\w\+' /usr/include/GL/gl.h 
/usr/include/GL/glext.h $(NVIDIAH)/GL/gl.h | grep -v 'OFFSET_TEXTURE_2D_[BMS]' 
| cut -c12- | awk '{print "{\"" $$1 "\", " $$2 "},"}' | LC_COLLATE=C sort > 
gltokens.c
--- 11,23 ----
  calltest: $(CTOBJS)
        $(CXX) $(CTOBJS) -o calltest -lglut -lGL -lGLU
  
! # gltokens.c is passed because of libglwrapper
! #   see ../libglwrapper/Makefile where it runs the almost same code 
! #   to grep tokens.
! #callgl.cxx: gltokens.c 
  
+ 
+ # XXX - Check the latest version from ../libglwrapper/Makefile!!!
  # XXX Make it check whether the user has the nvidia include file...
  gltokens.c: Makefile /usr/include/GL/gl.h /usr/include/GL/glext.h
        grep -h '#define GL_\w\+[[:space:]]\+\w\+' /usr/include/GL/gl.h 
/usr/include/GL/glext.h $(NVIDIAH)/GL/gl.h | grep -v 'OFFSET_TEXTURE_2D_[BMS]' 
| cut -c12- | awk '{print "{\"" $$1 "\", " $$2 "},"}' | LC_COLLATE=C sort > 
gltokens.c
Index: gzz/gfx/libglwrapper/Makefile
diff -c gzz/gfx/libglwrapper/Makefile:1.1 gzz/gfx/libglwrapper/Makefile:1.2
*** gzz/gfx/libglwrapper/Makefile:1.1   Fri Sep 27 08:32:49 2002
--- gzz/gfx/libglwrapper/Makefile       Wed Oct  9 09:39:39 2002
***************
*** 9,11 ****
--- 9,15 ----
  CTOBJS=GL_wrapper.o ../libutil/Debug.o
  
  GL_wrapper.cxx: ./GL/gl.h 
+ 
+ # Remember to make gltokens.c when your gfx-driver updates.
+ gltokens.c: 
+       grep -h '#define GL_\w\+[[:space:]]\+\w\+' gl.h /usr/include/GL/glext.h 
| grep -v 'OFFSET_TEXTURE_2D_[BMS]' | cut -c12- | awk '{print "{\"" $$1 "\", " 
$$2 "},"}' | LC_COLLATE=C sort | uniq > ../libcallgl/gltokens.c