diff options
| author | tanner <tanner> | 1999-09-19 20:09:00 +0000 |
|---|---|---|
| committer | tanner <tanner> | 1999-09-19 20:09:00 +0000 |
| commit | bc34adfc54369c216261548a2b251b258d64cd43 (patch) | |
| tree | 3a769aa92340a9d914a2d35b3cc153c04ba1cf32 | |
| parent | 01db31b67860f93b110733eb523d45e320a1c948 (diff) | |
lots of autoconf updates
| -rw-r--r-- | docs/VERSIONS | 3 | ||||
| -rw-r--r-- | include/GL/Makefile.am | 6 | ||||
| -rw-r--r-- | progs/demos/tessdemo.c | 12 |
3 files changed, 15 insertions, 6 deletions
diff --git a/docs/VERSIONS b/docs/VERSIONS index 258a0fc5e3e..80f4010afac 100644 --- a/docs/VERSIONS +++ b/docs/VERSIONS @@ -1,4 +1,4 @@ -$Id: VERSIONS,v 1.12 1999/09/15 16:34:43 brianp Exp $ +$Id: VERSIONS,v 1.13 1999/09/19 20:09:00 tanner Exp $ Mesa Version History @@ -658,3 +658,4 @@ Mesa Version History - New library names: "libGL" instead of "libMesaGL" - New library numbering: libGL.so.1.2.310 - New subdirectories: docs/ and bin/ + - New Makefile-system (autoconf,automake,libtool) diff --git a/include/GL/Makefile.am b/include/GL/Makefile.am index 61af039384a..16b4913e470 100644 --- a/include/GL/Makefile.am +++ b/include/GL/Makefile.am @@ -22,9 +22,13 @@ if HAVE_X11 INC_X11 = glx.h glx_mangle.h xmesa.h xmesa_x.h xmesa_xf86.h endif +if NEED_GLUT +INC_GLUT = glut.h +endif + EXTRA_DIST = fxmesa.h ggimesa.h osmesa.h svgamesa.h \ glx.h glx_mangle.h xmesa.h xmesa_x.h xmesa_xf86.h GLinclude_HEADERS = gl.h gl_mangle.h glu.h glu_mangle.h \ - $(INC_FX) $(INC_GGI) $(INC_OSMESA) $(INC_SVGA) $(INC_X11) + $(INC_FX) $(INC_GGI) $(INC_OSMESA) $(INC_SVGA) $(INC_X11) $(INC_GLUT) diff --git a/progs/demos/tessdemo.c b/progs/demos/tessdemo.c index 497b105a880..c0d0242b2e8 100644 --- a/progs/demos/tessdemo.c +++ b/progs/demos/tessdemo.c @@ -1,4 +1,4 @@ -/* $Id: tessdemo.c,v 1.1 1999/08/19 00:55:40 jtg Exp $ */ +/* $Id: tessdemo.c,v 1.2 1999/09/19 20:09:00 tanner Exp $ */ /* * A demo of the GLU polygon tesselation functions written by Bogdan Sikorski. @@ -11,8 +11,12 @@ /* * $Log: tessdemo.c,v $ - * Revision 1.1 1999/08/19 00:55:40 jtg - * Initial revision + * Revision 1.2 1999/09/19 20:09:00 tanner + * + * lots of autoconf updates + * + * Revision 1.1.1.1 1999/08/19 00:55:40 jtg + * Imported sources * * Revision 3.5 1999/03/28 18:24:37 brianp * minor clean-up @@ -148,7 +152,7 @@ void set_screen_wh(GLsizei w, GLsizei h) void tesse(void) { - GLUtriangulatorObj *tobj; + GLUtesselator *tobj; GLdouble data[3]; GLuint i,j,point_cnt; |