? build
? demos.diff
? marks.diff.gz
? safe_warnings.diff
? search.sed
? signed.diff
? status
? striplog.sed
Index: demos/Makefile.am
===================================================================
RCS file: /cvsroot/xforms/xforms/demos/Makefile.am,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile.am
--- demos/Makefile.am	13 Nov 2003 21:46:47 -0000	1.2
+++ demos/Makefile.am	21 Nov 2003 13:23:49 -0000
@@ -9,7 +9,13 @@ EXTRA_DIST = 01Readme iconvert.1 demo.me
 SUBDIRS = fd
 
 # forms.h is a generated file
-INCLUDES = -I../lib -I$(top_srcdir)/lib -I$(top_srcdir)/image
+INCLUDES = -I../lib -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/image
+
+if BUILD_GL
+GL = gl glwin
+else
+GL =
+endif
 
 noinst_PROGRAMS = arrowbutton \
 	borderwidth \
@@ -46,7 +52,7 @@ noinst_PROGRAMS = arrowbutton \
 	free1 \
 	freedraw \
 	freedraw_leak \
-	goodies \
+	$(GL) goodies \
 	group \
 	ibrowser \
 	iconify \
@@ -135,6 +141,15 @@ formbrowser_SOURCES = formbrowser.c
 free1_SOURCES = free1.c
 freedraw_SOURCES = freedraw.c
 freedraw_leak_SOURCES = freedraw_leak.c
+
+gl_SOURCES = gl.c
+gl_LDADD  = ../lib/libforms.la ../gl/libformsGL.la \
+	$(X_LIBS) $(X_PRE_LIBS) -lGL -lX11 $(LIBS) $(X_EXTRA_LIBS)
+
+glwin_SOURCES = glwin.c
+glwin_LDADD  = ../lib/libforms.la ../gl/libformsGL.la \
+	$(X_LIBS) $(X_PRE_LIBS) -lGL -lX11 $(LIBS) $(X_EXTRA_LIBS)
+
 goodies_SOURCES = goodies.c
 group_SOURCES = group.c
 
Index: demos/gl.c
===================================================================
RCS file: /cvsroot/xforms/xforms/demos/gl.c,v
retrieving revision 1.4
diff -u -p -r1.4 gl.c
--- demos/gl.c	9 Sep 2003 00:28:25 -0000	1.4
+++ demos/gl.c	21 Nov 2003 13:23:50 -0000
@@ -39,6 +39,8 @@
 #include "GL/gl.h"
 #include "GL/glx.h"
 #include "include/forms.h"
+#include "gl/glcanvas.h"
+
 #include <stdlib.h>
 
 typedef struct {
Index: demos/glwin.c
===================================================================
RCS file: /cvsroot/xforms/xforms/demos/glwin.c,v
retrieving revision 1.4
diff -u -p -r1.4 glwin.c
--- demos/glwin.c	9 Sep 2003 00:28:25 -0000	1.4
+++ demos/glwin.c	21 Nov 2003 13:23:50 -0000
@@ -33,6 +33,7 @@
 #include "GL/glx.h"
 #include "GL/gl.h"
 #include "include/forms.h"
+#include "gl/glcanvas.h"
 #include <stdlib.h>
 
 extern Window fl_glwincreate(int *, GLXContext *, int, int);