Mercurial > octave-nkf
changeset 7845:25f5d628bc8a
Fix OpenGL/FLTK compilation under Windows.
* * *
fltk_backend/Makefile.in: add GRAPHICS_CFLAGS variable.
| author | Michael Goffioul <michael.goffioul@gmail.com> |
|---|---|
| date | Tue, 26 Feb 2008 12:04:20 +0100 |
| parents | 3d60445d3638 |
| children | d7737a4268b7 |
| files | src/graphics/ChangeLog src/graphics/fltk_backend/Makefile.in src/graphics/opengl/gl-render.h |
| diffstat | 3 files changed, 23 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/graphics/ChangeLog Tue Feb 26 22:06:47 2008 +0100 +++ b/src/graphics/ChangeLog Tue Feb 26 12:04:20 2008 +0100 @@ -1,3 +1,15 @@ +2008-02-26 Michael Goffioul <michael.goffioul@gmail.com> + + * opengl/gl-render.h: Make sure windows.h is included before OpenGL + headers. + * fltk_backend/Makefile.in (FLTK_EXTRA_CXXFLAGS): Use $(srcdir) for + includesion of OpenGL renderer headers. + (Makeconf): Move inclusion of Makeconf later on, to avoid freezing + MinGW make. + + * fltk_backend/Makefile.in (GRAPHICS_CFLAGS): New substituted + variable. + 2008-02-25 Shai Ayal <shaiay@users.sourceforge.net> * fltk_backend/fltk_backend.cc (class plot_window): Many changes
--- a/src/graphics/fltk_backend/Makefile.in Tue Feb 26 22:06:47 2008 +0100 +++ b/src/graphics/fltk_backend/Makefile.in Tue Feb 26 12:04:20 2008 +0100 @@ -19,15 +19,18 @@ # <http://www.gnu.org/licenses/>. TOPDIR = ../../.. -include $(TOPDIR)/Makeconf srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ + GRAPHICS_LIBS = @GRAPHICS_LIBS@ +GRAPHICS_CFLAGS = @GRAPHICS_CFLAGS@ + +include $(TOPDIR)/Makeconf FLTK_EXTRA_LIBS = $(OPENGL_LIBS) $(GRAPHICS_LIBS) -FLTK_EXTRA_CXXFLAGS = $(GRAPHICS_CFLAGS) -I../opengl +FLTK_EXTRA_CXXFLAGS = $(GRAPHICS_CFLAGS) -I$(srcdir)/../opengl FLTK_NAME = fltk_backend
--- a/src/graphics/opengl/gl-render.h Tue Feb 26 22:06:47 2008 +0100 +++ b/src/graphics/opengl/gl-render.h Tue Feb 26 12:04:20 2008 +0100 @@ -23,6 +23,12 @@ #if !defined (gl_render_h) #define gl_render_h 1 +#include "config.h" + +#ifdef HAVE_WINDOWS_H +#include <windows.h> +#endif + #include <GL/gl.h> #include <GL/glu.h>