Mercurialoctave-graphics-mq / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw
no_fltk_opengl_compile
author Michael Goffioul <michael.goffioul@gmail.com>
Tue Jul 01 15:44:30 2008 +0200 (2008-07-01)
changeset 11 438c4abadf7b
permissions -rw-r--r--
Allow to compile octave without FLTK/OpenGL 
     1 Allow octave compilation without FLTK/OpenGL

     2 

     3 diff -r 0fbb10743090 ChangeLog

     4 --- a/ChangeLog	Tue Jul 01 15:11:03 2008 +0200

     5 +++ b/ChangeLog	Tue Jul 01 15:43:51 2008 +0200

     6 @@ -1,3 +1,8 @@

     7 +2008-07-01  Michael Goffioul  <michael.goffioul@gmail.com>

     8 +

     9 +	* configure.in: new substituted variables GL_RENDER_SRC and

    10 +	FLTK_BACKEND_SRC.

    11 +

    12  2008-06-20  Michael Goffioul <michael.goffioul@gmail.com>

    13  

    14  	* Makeconf.in: Add GRAPHICS_CFLAGS substitution.

    15 diff -r 0fbb10743090 configure.in

    16 --- a/configure.in	Tue Jul 01 15:11:03 2008 +0200

    17 +++ b/configure.in	Tue Jul 01 15:43:51 2008 +0200

    18 @@ -642,10 +642,12 @@

    19  

    20  warn_graphics=""

    21  

    22 +GL_RENDER_SRC=

    23  GRAPHICS_OPENGL=

    24  OCTAVE_OPENGL

    25  if test "x$OPENGL_LIBS" != "x"; then

    26    GRAPHICS_OPENGL="opengl"

    27 +  GL_RENDER_SRC="gl-render.cc"

    28  

    29  ## ftgl (needs freetype 2)

    30    AC_CHECK_FT2([9.0.3],[],

    31 @@ -677,6 +679,7 @@

    32  

    33  GRAPHICS_LIBS=

    34  GRAPHICS_CFLAGS=

    35 +FLTK_BACKEND_SRC=

    36  

    37  ## fltk (www.fltk.org)

    38  AC_ARG_WITH(fltk-prefix,

    39 @@ -723,6 +726,7 @@

    40      GRAPHICS_CFLAGS="$FLTK_CFLAGS"

    41      GRAPHICS_LIBS="$FLTK_LDFLAGS"

    42      GRAPHICS_OPENGL="$GRAPHICS_OPENGL fltk_backend"

    43 +    FLTK_BACKEND_SRC="fltk_backend.cc"

    44    else

    45      AC_MSG_RESULT(no)

    46    fi

    47 @@ -731,6 +735,8 @@

    48  AC_SUBST(GRAPHICS_CFLAGS)

    49  AC_SUBST(GRAPHICS_LIBS)

    50  AC_SUBST(GRAPHICS_OPENGL)

    51 +AC_SUBST(GL_RENDER_SRC)

    52 +AC_SUBST(FLTK_BACKEND_SRC)

    53  

    54  OCTAVE_IEEE754_DATA_FORMAT

    55  

    56 diff -r 0fbb10743090 src/ChangeLog

    57 --- a/src/ChangeLog	Tue Jul 01 15:11:03 2008 +0200

    58 +++ b/src/ChangeLog	Tue Jul 01 15:43:52 2008 +0200

    59 @@ -1,3 +1,8 @@

    60 +2008-07-01  Michael Goffioul  <michael.goffioul@gmail.com>

    61 +

    62 +	* Makefile.in: new substituted variables GL_RENDER_SRC and

    63 +	FLTK_BACKEND_SRC.

    64 +

    65  2008-07-01  Michael Goffioul  <michael.goffioul@gmail.com>

    66  

    67  	* gl-render.cc (vertex_data::vertex_data_rep::vertex_data(void),

    68 diff -r 0fbb10743090 src/Makefile.in

    69 --- a/src/Makefile.in	Tue Jul 01 15:11:03 2008 +0200

    70 +++ b/src/Makefile.in	Tue Jul 01 15:43:52 2008 +0200

    71 @@ -34,6 +34,9 @@

    72  INSTALL_PROGRAM = @INSTALL_PROGRAM@

    73  INSTALL_DATA = @INSTALL_DATA@

    74  

    75 +GL_RENDER_SRC = @GL_RENDER_SRC@

    76 +FLTK_BACKEND_SRC = @FLTK_BACKEND_SRC@

    77 +

    78  PT_FLAGS = -fexternal-templates -fno-implicit-templates

    79  CXXFLAGS_NO_PT_FLAGS = $(filter-out $(PT_FLAGS), $(ALL_CXXFLAGS))

    80  

    81 @@ -66,7 +69,7 @@

    82  	chol.cc ccolamd.cc colamd.cc colloc.cc conv2.cc convhulln.cc daspk.cc \

    83  	dasrt.cc dassl.cc det.cc dispatch.cc dlmread.cc dmperm.cc eig.cc \

    84  	expm.cc fft.cc fft2.cc fftn.cc fftw.cc filter.cc find.cc \

    85 -	fltk_backend.cc fsolve.cc \

    86 +	$(FLTK_BACKEND_SRC) fsolve.cc \

    87  	gammainc.cc gcd.cc getgrent.cc getpwent.cc getrusage.cc \

    88  	givens.cc hess.cc hex2num.cc inv.cc kron.cc lookup.cc lsode.cc \

    89  	lu.cc luinc.cc matrix_type.cc max.cc md5sum.cc pinv.cc qr.cc \

    90 @@ -197,7 +200,7 @@

    91  

    92  DIST_SRC := Cell.cc bitfcns.cc c-file-ptr-stream.cc comment-list.cc \

    93  	cutils.c data.cc debug.cc defaults.cc defun.cc dirfns.cc \

    94 -	dynamic-ld.cc error.cc file-io.cc gl-render.cc graphics.cc \

    95 +	dynamic-ld.cc error.cc file-io.cc $(GL_RENDER_SRC) graphics.cc \

    96  	gripes.cc help.cc input.cc lex.l load-path.cc load-save.cc \

    97  	ls-hdf5.cc ls-mat-ascii.cc ls-mat4.cc ls-mat5.cc ls-oct-ascii.cc \

    98  	ls-oct-binary.cc ls-utils.cc main.c mappers.cc matherr.c \
octave-graphics-mq