1 --- a/series Tue Jul 01 15:12:33 2008 +0200
2 +++ b/series Tue Jul 01 15:44:30 2008 +0200
3 @@ -2,3 +2,4 @@
4 mkoctfile_cpp_cleanup_o_files
5 msvc_compile_fix
6 vertex_data_refcount
7 +no_fltk_opengl_compile
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/no_fltk_opengl_compile Tue Jul 01 15:44:30 2008 +0200
1.3 @@ -0,0 +1,98 @@
1.4 +Allow octave compilation without FLTK/OpenGL
1.5 +
1.6 +diff -r 0fbb10743090 ChangeLog
1.7 +--- a/ChangeLog Tue Jul 01 15:11:03 2008 +0200
1.8 ++++ b/ChangeLog Tue Jul 01 15:43:51 2008 +0200
1.9 +@@ -1,3 +1,8 @@
1.10 ++2008-07-01 Michael Goffioul <michael.goffioul@gmail.com>
1.11 ++
1.12 ++ * configure.in: new substituted variables GL_RENDER_SRC and
1.13 ++ FLTK_BACKEND_SRC.
1.14 ++
1.15 + 2008-06-20 Michael Goffioul <michael.goffioul@gmail.com>
1.16 +
1.17 + * Makeconf.in: Add GRAPHICS_CFLAGS substitution.
1.18 +diff -r 0fbb10743090 configure.in
1.19 +--- a/configure.in Tue Jul 01 15:11:03 2008 +0200
1.20 ++++ b/configure.in Tue Jul 01 15:43:51 2008 +0200
1.21 +@@ -642,10 +642,12 @@
1.22 +
1.23 + warn_graphics=""
1.24 +
1.25 ++GL_RENDER_SRC=
1.26 + GRAPHICS_OPENGL=
1.27 + OCTAVE_OPENGL
1.28 + if test "x$OPENGL_LIBS" != "x"; then
1.29 + GRAPHICS_OPENGL="opengl"
1.30 ++ GL_RENDER_SRC="gl-render.cc"
1.31 +
1.32 + ## ftgl (needs freetype 2)
1.33 + AC_CHECK_FT2([9.0.3],[],
1.34 +@@ -677,6 +679,7 @@
1.35 +
1.36 + GRAPHICS_LIBS=
1.37 + GRAPHICS_CFLAGS=
1.38 ++FLTK_BACKEND_SRC=
1.39 +
1.40 + ## fltk (www.fltk.org)
1.41 + AC_ARG_WITH(fltk-prefix,
1.42 +@@ -723,6 +726,7 @@
1.43 + GRAPHICS_CFLAGS="$FLTK_CFLAGS"
1.44 + GRAPHICS_LIBS="$FLTK_LDFLAGS"
1.45 + GRAPHICS_OPENGL="$GRAPHICS_OPENGL fltk_backend"
1.46 ++ FLTK_BACKEND_SRC="fltk_backend.cc"
1.47 + else
1.48 + AC_MSG_RESULT(no)
1.49 + fi
1.50 +@@ -731,6 +735,8 @@
1.51 + AC_SUBST(GRAPHICS_CFLAGS)
1.52 + AC_SUBST(GRAPHICS_LIBS)
1.53 + AC_SUBST(GRAPHICS_OPENGL)
1.54 ++AC_SUBST(GL_RENDER_SRC)
1.55 ++AC_SUBST(FLTK_BACKEND_SRC)
1.56 +
1.57 + OCTAVE_IEEE754_DATA_FORMAT
1.58 +
1.59 +diff -r 0fbb10743090 src/ChangeLog
1.60 +--- a/src/ChangeLog Tue Jul 01 15:11:03 2008 +0200
1.61 ++++ b/src/ChangeLog Tue Jul 01 15:43:52 2008 +0200
1.62 +@@ -1,3 +1,8 @@
1.63 ++2008-07-01 Michael Goffioul <michael.goffioul@gmail.com>
1.64 ++
1.65 ++ * Makefile.in: new substituted variables GL_RENDER_SRC and
1.66 ++ FLTK_BACKEND_SRC.
1.67 ++
1.68 + 2008-07-01 Michael Goffioul <michael.goffioul@gmail.com>
1.69 +
1.70 + * gl-render.cc (vertex_data::vertex_data_rep::vertex_data(void),
1.71 +diff -r 0fbb10743090 src/Makefile.in
1.72 +--- a/src/Makefile.in Tue Jul 01 15:11:03 2008 +0200
1.73 ++++ b/src/Makefile.in Tue Jul 01 15:43:52 2008 +0200
1.74 +@@ -34,6 +34,9 @@
1.75 + INSTALL_PROGRAM = @INSTALL_PROGRAM@
1.76 + INSTALL_DATA = @INSTALL_DATA@
1.77 +
1.78 ++GL_RENDER_SRC = @GL_RENDER_SRC@
1.79 ++FLTK_BACKEND_SRC = @FLTK_BACKEND_SRC@
1.80 ++
1.81 + PT_FLAGS = -fexternal-templates -fno-implicit-templates
1.82 + CXXFLAGS_NO_PT_FLAGS = $(filter-out $(PT_FLAGS), $(ALL_CXXFLAGS))
1.83 +
1.84 +@@ -66,7 +69,7 @@
1.85 + chol.cc ccolamd.cc colamd.cc colloc.cc conv2.cc convhulln.cc daspk.cc \
1.86 + dasrt.cc dassl.cc det.cc dispatch.cc dlmread.cc dmperm.cc eig.cc \
1.87 + expm.cc fft.cc fft2.cc fftn.cc fftw.cc filter.cc find.cc \
1.88 +- fltk_backend.cc fsolve.cc \
1.89 ++ $(FLTK_BACKEND_SRC) fsolve.cc \
1.90 + gammainc.cc gcd.cc getgrent.cc getpwent.cc getrusage.cc \
1.91 + givens.cc hess.cc hex2num.cc inv.cc kron.cc lookup.cc lsode.cc \
1.92 + lu.cc luinc.cc matrix_type.cc max.cc md5sum.cc pinv.cc qr.cc \
1.93 +@@ -197,7 +200,7 @@
1.94 +
1.95 + DIST_SRC := Cell.cc bitfcns.cc c-file-ptr-stream.cc comment-list.cc \
1.96 + cutils.c data.cc debug.cc defaults.cc defun.cc dirfns.cc \
1.97 +- dynamic-ld.cc error.cc file-io.cc gl-render.cc graphics.cc \
1.98 ++ dynamic-ld.cc error.cc file-io.cc $(GL_RENDER_SRC) graphics.cc \
1.99 + gripes.cc help.cc input.cc lex.l load-path.cc load-save.cc \
1.100 + ls-hdf5.cc ls-mat-ascii.cc ls-mat4.cc ls-mat5.cc ls-oct-ascii.cc \
1.101 + ls-oct-binary.cc ls-utils.cc main.c mappers.cc matherr.c \