Mercurial > octave-nkf
changeset 7905:bcacdcc726f7
Allow octave compilation without FLTK/OpenGL
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Wed, 09 Jul 2008 11:00:21 -0400 |
| parents | 1fddd9b8e862 |
| children | b3becd212f3f |
| files | ChangeLog configure.in src/ChangeLog src/Makefile.in |
| diffstat | 4 files changed, 19 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Jul 09 10:59:29 2008 -0400 +++ b/ChangeLog Wed Jul 09 11:00:21 2008 -0400 @@ -1,3 +1,8 @@ +2008-07-09 Michael Goffioul <michael.goffioul@gmail.com> + + * configure.in: new substituted variables GL_RENDER_SRC and + FLTK_BACKEND_SRC. + 2008-06-12 Jaroslav Hajek <highegg@gmail.com> * configure.in: Move LIBS and CXXFLAGS restoration into
--- a/configure.in Wed Jul 09 10:59:29 2008 -0400 +++ b/configure.in Wed Jul 09 11:00:21 2008 -0400 @@ -642,10 +642,12 @@ warn_graphics="" +GL_RENDER_SRC= GRAPHICS_OPENGL= OCTAVE_OPENGL if test "x$OPENGL_LIBS" != "x"; then GRAPHICS_OPENGL="opengl" + GL_RENDER_SRC="gl-render.cc" ## ftgl (needs freetype 2) AC_CHECK_FT2([9.0.3],[], @@ -677,6 +679,7 @@ GRAPHICS_LIBS= GRAPHICS_CFLAGS= +FLTK_BACKEND_SRC= ## fltk (www.fltk.org) AC_ARG_WITH(fltk-prefix, @@ -723,6 +726,7 @@ GRAPHICS_CFLAGS="$FLTK_CFLAGS" GRAPHICS_LIBS="$FLTK_LDFLAGS" GRAPHICS_OPENGL="$GRAPHICS_OPENGL fltk_backend" + FLTK_BACKEND_SRC="fltk_backend.cc" else AC_MSG_RESULT(no) fi @@ -731,6 +735,8 @@ AC_SUBST(GRAPHICS_CFLAGS) AC_SUBST(GRAPHICS_LIBS) AC_SUBST(GRAPHICS_OPENGL) +AC_SUBST(GL_RENDER_SRC) +AC_SUBST(FLTK_BACKEND_SRC) OCTAVE_IEEE754_DATA_FORMAT
--- a/src/ChangeLog Wed Jul 09 10:59:29 2008 -0400 +++ b/src/ChangeLog Wed Jul 09 11:00:21 2008 -0400 @@ -1,5 +1,8 @@ 2008-07-09 Michael Goffioul <michael.goffioul@gmail.com> + * Makefile.in: new substituted variables GL_RENDER_SRC and + FLTK_BACKEND_SRC. + * gl-render.cc (vertex_data::vertex_data_rep::vertex_data(void), vertex_data::vertex_data(void), vertex_data::vertex_data(...)): initialize reference counting correctly.
--- a/src/Makefile.in Wed Jul 09 10:59:29 2008 -0400 +++ b/src/Makefile.in Wed Jul 09 11:00:21 2008 -0400 @@ -34,6 +34,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ +GL_RENDER_SRC = @GL_RENDER_SRC@ +FLTK_BACKEND_SRC = @FLTK_BACKEND_SRC@ + PT_FLAGS = -fexternal-templates -fno-implicit-templates CXXFLAGS_NO_PT_FLAGS = $(filter-out $(PT_FLAGS), $(ALL_CXXFLAGS)) @@ -66,7 +69,7 @@ chol.cc ccolamd.cc colamd.cc colloc.cc conv2.cc convhulln.cc daspk.cc \ dasrt.cc dassl.cc det.cc dispatch.cc dlmread.cc dmperm.cc eig.cc \ expm.cc fft.cc fft2.cc fftn.cc fftw.cc filter.cc find.cc \ - fltk_backend.cc fsolve.cc \ + $(FLTK_BACKEND_SRC) fsolve.cc \ gammainc.cc gcd.cc getgrent.cc getpwent.cc getrusage.cc \ givens.cc hess.cc hex2num.cc inv.cc kron.cc lookup.cc lsode.cc \ lu.cc luinc.cc matrix_type.cc max.cc md5sum.cc pinv.cc qr.cc \ @@ -197,7 +200,7 @@ DIST_SRC := Cell.cc bitfcns.cc c-file-ptr-stream.cc comment-list.cc \ cutils.c data.cc debug.cc defaults.cc defun.cc dirfns.cc \ - dynamic-ld.cc error.cc file-io.cc gl-render.cc graphics.cc \ + dynamic-ld.cc error.cc file-io.cc $(GL_RENDER_SRC) graphics.cc \ gripes.cc help.cc input.cc lex.l load-path.cc load-save.cc \ ls-hdf5.cc ls-mat-ascii.cc ls-mat4.cc ls-mat5.cc ls-oct-ascii.cc \ ls-oct-binary.cc ls-utils.cc main.c mappers.cc matherr.c \