Revert "Switch from GtkGLExt to internal OpenGL handling"

[grits] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 18659d3df686f0e17a3060c989e530933636dd46..258a4425f36c573ac3d401af5e63cbec64871d38 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,8 +1,8 @@
 SUBDIRS = data objects . plugins
 
 AM_CFLAGS   = -Wall --std=gnu99 -I$(top_srcdir)/src
-AM_CPPFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(GL_CFLAGS) $(SOUP_CFLAGS)
-AM_LDADD    = $(GLIB_LIBS) $(GTK_LIBS) $(GL_LIBS) $(SOUP_LIBS)
+AM_CPPFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(SOUP_CFLAGS)
+AM_LDADD    = $(GLIB_LIBS) $(GTK_LIBS) $(SOUP_LIBS)
 AM_LDFLAGS  = -Wl,--as-needed -Wl,--no-undefined
 
 BUILT_SOURCES = grits-marshal.c grits-marshal.h
@@ -35,7 +35,6 @@ libgrits_la_SOURCES = grits.h \
        grits-marshal.c grits-marshal.h \
        grits-util.c    grits-util.h    \
        roam.c          roam.h          \
-       gtkgl.c         gtkgl.h         \
        gpqueue.c       gpqueue.h
 libgrits_la_CPPFLAGS = $(AM_CPPFLAGS) \
        -DPKGDATADIR="\"$(dots)$(datadir)/$(GRITS_SUBDIR)\"" \
@@ -48,11 +47,8 @@ libgrits_la_LDFLAGS = $(AM_LDFLAGS) \
 
 # Demo program
 if WIN32
-AM_CPPFLAGS += -DUSE_WGL
-AM_LDFLAGS  += -mwindows -no-undefined
-dots         = ..
-else
-AM_CPPFLAGS += -DUSE_GLX
+AM_LDFLAGS += -mwindows -no-undefined
+dots        = ..
 endif
 
 bin_PROGRAMS = grits-demo