7 files changed, 33 insertions, 29 deletions
diff --git a/progs/ggi/asc-view.c b/progs/ggi/asc-view.c
index 16f53e5509..d37fba9d9f 100644
--- a/progs/ggi/asc-view.c
+++ b/progs/ggi/asc-view.c
@@ -31,8 +31,8 @@ ggi_visual_t vis,vis_mem;
 
 GGIMesaContext ctx;
 
-int screen_x=320,screen_y=200;
-ggi_graphtype bpp=GT_16BIT;
+int screen_x=GGI_AUTO,screen_y=GGI_AUTO;
+ggi_graphtype bpp=GT_AUTO;
 
 //#define ZBUFFER
 
@@ -318,9 +318,32 @@ double Display(GLuint l,int *maxframes)
 	return len;
 }
 
+void visible(int vis)
+{
+	if (vis == GLUT_VISIBLE)
+	  glutIdleFunc(idle);
+	else
+	  glutIdleFunc(NULL);
+}
 
-int main(int argc,char **argv)
+int main(int argc, char *argv[])
 {
+	glutInit(&argc, argv);
+	glutInitDisplayMode(GLUT_RGB | GLUT_DEPTH | GLUT_DOUBLE);
+	
+	glutInitWindowPosition(0, 0);
+	glutInitWindowSize(300, 300);
+	glutCreateWindow("asc-view");
+	init();
+	
+	glutDisplayFunc(draw);
+	glutReshapeFunc(reshape);
+	glutKeyboardFunc(key);
+	glutSpecialFunc(special);
+	glutVisibilityFunc(visible);
+	
+	glutMainLoop();
+#if 0
 	GLuint l;
 	char *file;
 	int maxframes=0;
@@ -348,6 +371,7 @@ int main(int argc,char **argv)
 	ggiClose(vis);
 	ggiClose(vis_mem);
 	ggiExit();
+#endif
 	return 0;
 }
 
diff --git a/progs/ggi/gears.c b/progs/ggi/gears.c
index a6b5f7dda1..61a8b9f331 100644
--- a/progs/ggi/gears.c
+++ b/progs/ggi/gears.c
@@ -1,4 +1,4 @@
-/* $Id: gears.c,v 1.1 1999/08/21 06:27:37 jtaylor Exp $ */
+/* $Id: gears.c,v 1.2 1999/08/21 08:53:27 jtaylor Exp $ */
 
 /*
  * 3-D gear wheels.  This program is in the public domain.
@@ -8,26 +8,6 @@
 
 /* Conversion to GLUT by Mark J. Kilgard */
 
-/*
- * $Log: gears.c,v $
- * Revision 1.1  1999/08/21 06:27:37  jtaylor
- * *** empty log message ***
- *
- * Revision 1.5  1999/07/31 21:51:09  jtaylor
- * *** empty log message ***
- *
- * Revision 3.2  1999/06/03 17:07:36  brianp
- * an extra quad was being drawn in front and back faces
- *
- * Revision 3.1  1998/11/03 02:49:10  brianp
- * added fps output
- *
- * Revision 3.0  1998/02/14 18:42:29  brianp
- * initial rev
- *
- */
-
-
 #include <math.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/src/mesa/drivers/ggi/default/linear_15.c b/src/mesa/drivers/ggi/default/linear_15.c
index 8eb89f9795..05879d10a9 100644
--- a/src/mesa/drivers/ggi/default/linear_15.c
+++ b/src/mesa/drivers/ggi/default/linear_15.c
@@ -31,5 +31,5 @@
 #define FB_TYPE uint16
 #define FB_BITS 15
 
-#include "../common/linear.c"
+#include "linear.c"
 
diff --git a/src/mesa/drivers/ggi/default/linear_16.c b/src/mesa/drivers/ggi/default/linear_16.c
index d7eeef1123..221891bf20 100644
--- a/src/mesa/drivers/ggi/default/linear_16.c
+++ b/src/mesa/drivers/ggi/default/linear_16.c
@@ -31,5 +31,5 @@
 #define FB_TYPE uint16
 #define FB_BITS 16
 
-#include "../common/linear.c"
+#include "linear.c"
 
diff --git a/src/mesa/drivers/ggi/default/linear_24.c b/src/mesa/drivers/ggi/default/linear_24.c
index 6058a2a168..0d315321f0 100644
--- a/src/mesa/drivers/ggi/default/linear_24.c
+++ b/src/mesa/drivers/ggi/default/linear_24.c
@@ -31,5 +31,5 @@
 #define FB_TYPE uint32
 #define FB_BITS 24
 
-#include "../common/linear.c"
+#include "linear.c"
 
diff --git a/src/mesa/drivers/ggi/default/linear_32.c b/src/mesa/drivers/ggi/default/linear_32.c
index 13631b4747..d16a923b35 100644
--- a/src/mesa/drivers/ggi/default/linear_32.c
+++ b/src/mesa/drivers/ggi/default/linear_32.c
@@ -31,5 +31,5 @@
 #define FB_TYPE uint32
 #define FB_BITS 32
 
-#include "../common/linear.c"
+#include "linear.c"
 
diff --git a/src/mesa/drivers/ggi/default/linear_8.c b/src/mesa/drivers/ggi/default/linear_8.c
index 027f21f80d..19a3ee27e4 100644
--- a/src/mesa/drivers/ggi/default/linear_8.c
+++ b/src/mesa/drivers/ggi/default/linear_8.c
@@ -31,5 +31,5 @@
 #define FB_TYPE uint8
 #define FB_BITS 8
 
-#include "../common/linear.c"
+#include "linear.c"