Remove optional GLUT dependencies

The teapot easter egg kept crashing, and I'm too lazy to fix it.

diff --git a/configure.ac b/configure.ac
index 4c584e7e5c57183984640fe865a7d9669bb6fb29..7038d481ce9f455d560df2920e17152f69402af7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -41,11 +41,6 @@ AS_IF([test "$enable_gtk3" = "yes"],
        [GTK_VERSION=gtk+-2.0])
 AC_SUBST(GTK_VERSION)
 
        [GTK_VERSION=gtk+-2.0])
 AC_SUBST(GTK_VERSION)
 

-# Check for glut for example plugin
-AC_CHECK_LIB(glut, glutSolidTeapot, GLUT_LIBS="-lglut")
-AM_CONDITIONAL(HAVE_GLUT, test "$GLUT_LIBS" != "")
-AC_SUBST(GLUT_LIBS)
-

 # Test for windowing system
 case "${host}" in
        *mingw32*) SYS="WIN" ;;
 # Test for windowing system
 case "${host}" in
        *mingw32*) SYS="WIN" ;;

diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index 5fc085d529f4c679c092d78c262b101cb23244f2..9e8628c54e0558c3f96928424891930bd093d352 100644 (file)
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -24,15 +24,5 @@ test_la_SOURCES     = test.c test.h
 env_la_CPPFLAGS     = $(AM_CPPFLAGS)
 env_la_LDFLAGS      = $(AM_LDFLAGS)
 
 env_la_CPPFLAGS     = $(AM_CPPFLAGS)
 env_la_LDFLAGS      = $(AM_LDFLAGS)
 

-if HAVE_GLUT
-noinst_LTLIBRARIES  = teapot.la
-teapot_la_SOURCES   = \
-       $(top_srcdir)/examples/plugin/teapot.c \
-       $(top_srcdir)/examples/plugin/teapot.h
-teapot_la_LDFLAGS   = $(AM_LDFLAGS) -lglut -rpath $(libdir) # I hate you libtool
-env_la_CPPFLAGS    += -DHAVE_GLUT
-env_la_LDFLAGS     += -lglut
-endif
-

 test:
        ( cd ../; make test )
 test:
        ( cd ../; make test )

diff --git a/src/plugins/env.c b/src/plugins/env.c
index 717e9d71ed288317a485ab1cf36db82d876621a7..64ba8e336220d66e078c5a461eb83be9cb07f92e 100644 (file)
--- a/src/plugins/env.c
+++ b/src/plugins/env.c
@@ -28,10 +28,6 @@
 
 #include <grits.h>
 
 
 #include <grits.h>
 

-#ifdef HAVE_GLUT
-#include <GL/glut.h>
-#endif
-

 #include "env.h"
 
 /***********
 #include "env.h"
 
 /***********


@@ -156,37 +152,6 @@ static void compass_draw_compass(gdouble scale)
        }
 }
 
        }
 }
 

-static gboolean compass_draw_teapot(gdouble scale, GritsPluginEnv *env)
-{
-       static int teatime = 0;
-#ifdef HAVE_GLUT
-       static int init, argc; char *argv[] = {"", NULL};
-       if (!init) {
-               teatime = grits_prefs_get_boolean(env->prefs, "grits/teatime", NULL);
-               glutInit(&argc, argv);
-               init = 1;
-               g_message("teatime=%d", teatime);
-       }
-
-       if (teatime) {
-               /* Setup lighting */
-               float light_ambient[]  = {0.1f, 0.1f, 0.0f, 1.0f};
-               float light_diffuse[]  = {0.9f, 0.9f, 0.9f, 1.0f};
-               float light_position[] = {-50.0f, -40.0f, -80.0f, 1.0f};
-               glLightfv(GL_LIGHT0, GL_AMBIENT,  light_ambient);
-               glLightfv(GL_LIGHT0, GL_DIFFUSE,  light_diffuse);
-               glLightfv(GL_LIGHT0, GL_POSITION, light_position);
-
-               /* Draw teapot */
-               glRotatef(-90, 0, 0, 1);
-               glRotatef(-90, 1, 0, 0);
-               glColor4f(0.9, 0.9, 0.7, 1.0);
-               glutSolidTeapot(scale * 0.60);
-       }
-#endif
-       return teatime;
-}
-

 static void compass_expose(GritsCallback *compass, GritsOpenGL *opengl, gpointer _env)
 {
        GritsPluginEnv *env = GRITS_PLUGIN_ENV(_env);
 static void compass_expose(GritsCallback *compass, GritsOpenGL *opengl, gpointer _env)
 {
        GritsPluginEnv *env = GRITS_PLUGIN_ENV(_env);


@@ -213,8 +178,7 @@ static void compass_expose(GritsCallback *compass, GritsOpenGL *opengl, gpointer
        x = CLAMP(x, -66, 66);;
        glRotatef(x, 1, 0, 0);
        glRotatef(-z, 0, 0, 1);
        x = CLAMP(x, -66, 66);;
        glRotatef(x, 1, 0, 0);
        glRotatef(-z, 0, 0, 1);

-       if (!compass_draw_teapot(scale, env))
-               compass_draw_compass(scale);
+       compass_draw_compass(scale);

 }
 
 static gboolean compass_click(GritsCallback *compass, GdkEvent *evnet, GritsViewer *viewer)
 }
 
 static gboolean compass_click(GritsCallback *compass, GdkEvent *evnet, GritsViewer *viewer)