[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] gzz/gfx libcallgl/Makefile libglwrapper/Makefile
From: |
Matti Katila |
Subject: |
[Gzz-commits] gzz/gfx libcallgl/Makefile libglwrapper/Makefile |
Date: |
Sat, 12 Oct 2002 08:13:59 -0400 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Matti Katila <address@hidden> 02/10/12 08:13:59
Modified files:
gfx/libcallgl : Makefile
gfx/libglwrapper: Makefile
Log message:
makefile fix
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libcallgl/Makefile.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/libglwrapper/Makefile.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
Patches:
Index: gzz/gfx/libcallgl/Makefile
diff -c gzz/gfx/libcallgl/Makefile:1.11 gzz/gfx/libcallgl/Makefile:1.12
*** gzz/gfx/libcallgl/Makefile:1.11 Wed Oct 9 09:39:39 2002
--- gzz/gfx/libcallgl/Makefile Sat Oct 12 08:13:59 2002
***************
*** 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
--- 11,27 ----
calltest: $(CTOBJS)
$(CXX) $(CTOBJS) -o calltest -lglut -lGL -lGLU
! callgl.cxx: gltokens.c
! # original
!
! #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| uniq
> gltokens.c
!
!
! # with libgwrapper
!
! GL_HEADER= ../libglwrapper/GL/gl.h /usr/include/GL/glext.h
! gltokens.c: Makefile $(GL_HEADER)
! grep -h '#define GL_\w\+[[:space:]]\+\w\+' $(GL_HEADER) | grep -v
'OFFSET_TEXTURE_2D_[BMS]' | cut -c12- | awk '{print "{\"" $$1 "\", " $$2 "},"}'
| LC_COLLATE=C sort| uniq > gltokens.c
Index: gzz/gfx/libglwrapper/Makefile
diff -c gzz/gfx/libglwrapper/Makefile:1.2 gzz/gfx/libglwrapper/Makefile:1.3
*** gzz/gfx/libglwrapper/Makefile:1.2 Wed Oct 9 09:39:39 2002
--- gzz/gfx/libglwrapper/Makefile Sat Oct 12 08:13:59 2002
***************
*** 10,15 ****
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
--- 10,15 ----
GL_wrapper.cxx: ./GL/gl.h
! # The correct place for gltokens.c generating is in ../libcallgl
! #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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] gzz/gfx libcallgl/Makefile libglwrapper/Makefile,
Matti Katila <=