From: Oliver O. <fr...@us...> - 2007-06-17 11:04:46
|
Update of /cvsroot/simspark/simspark/spark/kerosin In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv1940 Modified Files: Tag: projectx Makefile.am Log Message: - added materialexternal - finally removed glextensionreg stuff Index: Makefile.am =================================================================== RCS file: /cvsroot/simspark/simspark/spark/kerosin/Makefile.am,v retrieving revision 1.6.2.2.2.2 retrieving revision 1.6.2.2.2.3 diff -C2 -d -r1.6.2.2.2.2 -r1.6.2.2.2.3 *** Makefile.am 8 May 2007 03:39:08 -0000 1.6.2.2.2.2 --- Makefile.am 17 Jun 2007 11:04:29 -0000 1.6.2.2.2.3 *************** *** 3,7 **** pkglib_LTLIBRARIES = libkerosin_debug.la libkerosin_debug_la_SOURCES = $(sources) - # nodist_libkerosin_debug_la_SOURCES = openglserver/glextensionreg.cpp libkerosin_debug_la_CXXFLAGS = -O -g -W -Wall libkerosin_debug_la_LIBADD = @FREETYPE_LIBADD@ @SDL_LIBADD@ @IL_LIBADD@ @GL_LIBADD@ --- 3,6 ---- *************** *** 10,14 **** pkglib_LTLIBRARIES = libkerosin.la libkerosin_la_SOURCES = $(sources) - # nodist_libkerosin_la_SOURCES = openglserver/glextensionreg.cpp libkerosin_la_CXXFLAGS = -O2 libkerosin_la_LIBADD = @FREETYPE_LIBADD@ @SDL_LIBADD@ @IL_LIBADD@ @GL_LIBADD@ --- 9,12 ---- *************** *** 18,33 **** bin_SCRIPTS = kerosin-config - # BUILT_SOURCES = openglserver/glextensionreg.h - # nobase_nodist_libpkginclude_HEADERS = openglserver/glextensionreg.h - - # openglserver/glextensionreg.cpp: ${top_srcdir}/utility/glextgen/glextensionreg.cpp - # @echo "Copying generated glextension sources" - # cp ${top_srcdir}/utility/glextgen/glextensionreg.cpp $@ - - # openglserver/glextensionreg.h: ${top_srcdir}/utility/glextgen/glextensionreg.h - # cp ${top_srcdir}/utility/glextgen/glextensionreg.h $@ - - # ${top_srcdir}/utility/glextgen/glextensionreg.cpp ${top_srcdir}/utility/glextgen/glextensionreg.h: - # cd ${top_srcdir}/utility/glextgen/ && $(MAKE) $(AM_MAKEFLAGS) all endif --- 16,19 ---- *************** *** 68,71 **** --- 54,59 ---- materialserver/material2dtexture.cpp \ materialserver/material2dtexture_c.cpp \ + materialserver/materialexternal.cpp \ + materialserver/materialexternal_c.cpp \ materialserver/materialsolid.cpp \ materialserver/materialsolid_c.cpp \ *************** *** 131,134 **** --- 119,123 ---- sceneserver/helper/nv_math/nv_mathdecl.h \ materialserver/material2dtexture.h \ + materialserver/materialexternal.h \ materialserver/materialsolid.h \ materialserver/materialexporter.h \ |