|
michael@11
|
1 |
Allow octave compilation without FLTK/OpenGL
|
|
michael@11
|
2 |
|
|
michael@11
|
3 |
diff -r 0fbb10743090 ChangeLog
|
|
michael@11
|
4 |
--- a/ChangeLog Tue Jul 01 15:11:03 2008 +0200
|
|
michael@11
|
5 |
+++ b/ChangeLog Tue Jul 01 15:43:51 2008 +0200
|
|
michael@11
|
6 |
@@ -1,3 +1,8 @@
|
|
michael@11
|
7 |
+2008-07-01 Michael Goffioul <michael.goffioul@gmail.com>
|
|
michael@11
|
8 |
+
|
|
michael@11
|
9 |
+ * configure.in: new substituted variables GL_RENDER_SRC and
|
|
michael@11
|
10 |
+ FLTK_BACKEND_SRC.
|
|
michael@11
|
11 |
+
|
|
michael@11
|
12 |
2008-06-20 Michael Goffioul <michael.goffioul@gmail.com>
|
|
michael@11
|
13 |
|
|
michael@11
|
14 |
* Makeconf.in: Add GRAPHICS_CFLAGS substitution.
|
|
michael@11
|
15 |
diff -r 0fbb10743090 configure.in
|
|
michael@11
|
16 |
--- a/configure.in Tue Jul 01 15:11:03 2008 +0200
|
|
michael@11
|
17 |
+++ b/configure.in Tue Jul 01 15:43:51 2008 +0200
|
|
michael@11
|
18 |
@@ -642,10 +642,12 @@
|
|
michael@11
|
19 |
|
|
michael@11
|
20 |
warn_graphics=""
|
|
michael@11
|
21 |
|
|
michael@11
|
22 |
+GL_RENDER_SRC=
|
|
michael@11
|
23 |
GRAPHICS_OPENGL=
|
|
michael@11
|
24 |
OCTAVE_OPENGL
|
|
michael@11
|
25 |
if test "x$OPENGL_LIBS" != "x"; then
|
|
michael@11
|
26 |
GRAPHICS_OPENGL="opengl"
|
|
michael@11
|
27 |
+ GL_RENDER_SRC="gl-render.cc"
|
|
michael@11
|
28 |
|
|
michael@11
|
29 |
## ftgl (needs freetype 2)
|
|
michael@11
|
30 |
AC_CHECK_FT2([9.0.3],[],
|
|
michael@11
|
31 |
@@ -677,6 +679,7 @@
|
|
michael@11
|
32 |
|
|
michael@11
|
33 |
GRAPHICS_LIBS=
|
|
michael@11
|
34 |
GRAPHICS_CFLAGS=
|
|
michael@11
|
35 |
+FLTK_BACKEND_SRC=
|
|
michael@11
|
36 |
|
|
michael@11
|
37 |
## fltk (www.fltk.org)
|
|
michael@11
|
38 |
AC_ARG_WITH(fltk-prefix,
|
|
michael@11
|
39 |
@@ -723,6 +726,7 @@
|
|
michael@11
|
40 |
GRAPHICS_CFLAGS="$FLTK_CFLAGS"
|
|
michael@11
|
41 |
GRAPHICS_LIBS="$FLTK_LDFLAGS"
|
|
michael@11
|
42 |
GRAPHICS_OPENGL="$GRAPHICS_OPENGL fltk_backend"
|
|
michael@11
|
43 |
+ FLTK_BACKEND_SRC="fltk_backend.cc"
|
|
michael@11
|
44 |
else
|
|
michael@11
|
45 |
AC_MSG_RESULT(no)
|
|
michael@11
|
46 |
fi
|
|
michael@11
|
47 |
@@ -731,6 +735,8 @@
|
|
michael@11
|
48 |
AC_SUBST(GRAPHICS_CFLAGS)
|
|
michael@11
|
49 |
AC_SUBST(GRAPHICS_LIBS)
|
|
michael@11
|
50 |
AC_SUBST(GRAPHICS_OPENGL)
|
|
michael@11
|
51 |
+AC_SUBST(GL_RENDER_SRC)
|
|
michael@11
|
52 |
+AC_SUBST(FLTK_BACKEND_SRC)
|
|
michael@11
|
53 |
|
|
michael@11
|
54 |
OCTAVE_IEEE754_DATA_FORMAT
|
|
michael@11
|
55 |
|
|
michael@11
|
56 |
diff -r 0fbb10743090 src/ChangeLog
|
|
michael@11
|
57 |
--- a/src/ChangeLog Tue Jul 01 15:11:03 2008 +0200
|
|
michael@11
|
58 |
+++ b/src/ChangeLog Tue Jul 01 15:43:52 2008 +0200
|
|
michael@11
|
59 |
@@ -1,3 +1,8 @@
|
|
michael@11
|
60 |
+2008-07-01 Michael Goffioul <michael.goffioul@gmail.com>
|
|
michael@11
|
61 |
+
|
|
michael@11
|
62 |
+ * Makefile.in: new substituted variables GL_RENDER_SRC and
|
|
michael@11
|
63 |
+ FLTK_BACKEND_SRC.
|
|
michael@11
|
64 |
+
|
|
michael@11
|
65 |
2008-07-01 Michael Goffioul <michael.goffioul@gmail.com>
|
|
michael@11
|
66 |
|
|
michael@11
|
67 |
* gl-render.cc (vertex_data::vertex_data_rep::vertex_data(void),
|
|
michael@11
|
68 |
diff -r 0fbb10743090 src/Makefile.in
|
|
michael@11
|
69 |
--- a/src/Makefile.in Tue Jul 01 15:11:03 2008 +0200
|
|
michael@11
|
70 |
+++ b/src/Makefile.in Tue Jul 01 15:43:52 2008 +0200
|
|
michael@11
|
71 |
@@ -34,6 +34,9 @@
|
|
michael@11
|
72 |
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
|
michael@11
|
73 |
INSTALL_DATA = @INSTALL_DATA@
|
|
michael@11
|
74 |
|
|
michael@11
|
75 |
+GL_RENDER_SRC = @GL_RENDER_SRC@
|
|
michael@11
|
76 |
+FLTK_BACKEND_SRC = @FLTK_BACKEND_SRC@
|
|
michael@11
|
77 |
+
|
|
michael@11
|
78 |
PT_FLAGS = -fexternal-templates -fno-implicit-templates
|
|
michael@11
|
79 |
CXXFLAGS_NO_PT_FLAGS = $(filter-out $(PT_FLAGS), $(ALL_CXXFLAGS))
|
|
michael@11
|
80 |
|
|
michael@11
|
81 |
@@ -66,7 +69,7 @@
|
|
michael@11
|
82 |
chol.cc ccolamd.cc colamd.cc colloc.cc conv2.cc convhulln.cc daspk.cc \
|
|
michael@11
|
83 |
dasrt.cc dassl.cc det.cc dispatch.cc dlmread.cc dmperm.cc eig.cc \
|
|
michael@11
|
84 |
expm.cc fft.cc fft2.cc fftn.cc fftw.cc filter.cc find.cc \
|
|
michael@11
|
85 |
- fltk_backend.cc fsolve.cc \
|
|
michael@11
|
86 |
+ $(FLTK_BACKEND_SRC) fsolve.cc \
|
|
michael@11
|
87 |
gammainc.cc gcd.cc getgrent.cc getpwent.cc getrusage.cc \
|
|
michael@11
|
88 |
givens.cc hess.cc hex2num.cc inv.cc kron.cc lookup.cc lsode.cc \
|
|
michael@11
|
89 |
lu.cc luinc.cc matrix_type.cc max.cc md5sum.cc pinv.cc qr.cc \
|
|
michael@11
|
90 |
@@ -197,7 +200,7 @@
|
|
michael@11
|
91 |
|
|
michael@11
|
92 |
DIST_SRC := Cell.cc bitfcns.cc c-file-ptr-stream.cc comment-list.cc \
|
|
michael@11
|
93 |
cutils.c data.cc debug.cc defaults.cc defun.cc dirfns.cc \
|
|
michael@11
|
94 |
- dynamic-ld.cc error.cc file-io.cc gl-render.cc graphics.cc \
|
|
michael@11
|
95 |
+ dynamic-ld.cc error.cc file-io.cc $(GL_RENDER_SRC) graphics.cc \
|
|
michael@11
|
96 |
gripes.cc help.cc input.cc lex.l load-path.cc load-save.cc \
|
|
michael@11
|
97 |
ls-hdf5.cc ls-mat-ascii.cc ls-mat4.cc ls-mat5.cc ls-oct-ascii.cc \
|
|
michael@11
|
98 |
ls-oct-binary.cc ls-utils.cc main.c mappers.cc matherr.c \
|