Mercurial > octave
comparison libinterp/dldfcn/__init_fltk__.cc @ 21196:bd96c2efd4fe
move include statements for OpenGL headers to a single file
* oct-opengl.h: New file.
* libinterp/corefcn/module.mk: Update.
* Canvas.cc, gl-select.cc, gl-select.h, gl-render.cc, gl-render.h,
gl2ps-renderer.cc, __init_fltk__.cc, __osmesa_print__.cc:
Update include statements.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 04 Feb 2016 16:56:02 -0500 |
parents | 538b57866b90 |
children | dd6605e1eaea |
comparison
equal
deleted
inserted
replaced
21195:53ac24e210e4 | 21196:bd96c2efd4fe |
---|---|
39 | 39 |
40 #include "builtin-defun-decls.h" | 40 #include "builtin-defun-decls.h" |
41 #include "defun-dld.h" | 41 #include "defun-dld.h" |
42 #include "error.h" | 42 #include "error.h" |
43 #include "errwarn.h" | 43 #include "errwarn.h" |
44 #include "oct-opengl.h" | |
44 #include "ov-fcn-handle.h" | 45 #include "ov-fcn-handle.h" |
45 | 46 |
46 #ifdef HAVE_FLTK | 47 #ifdef HAVE_FLTK |
47 | 48 |
48 #if defined (HAVE_X_WINDOWS) | 49 #if defined (HAVE_X_WINDOWS) |
49 #include <X11/Xlib.h> | 50 # include <X11/Xlib.h> |
50 #endif | 51 #endif |
51 | 52 |
52 #include <map> | 53 #include <map> |
53 #include <set> | 54 #include <set> |
54 #include <sstream> | 55 #include <sstream> |
55 #include <iostream> | 56 #include <iostream> |
56 | 57 |
57 #ifdef WIN32 | 58 #if defined (WIN32) |
58 #define WIN32_LEAN_AND_MEAN | 59 # define WIN32_LEAN_AND_MEAN |
59 #endif | 60 #endif |
60 | 61 |
61 #include <FL/Fl.H> | 62 #include <FL/Fl.H> |
62 #include <FL/Fl_Box.H> | 63 #include <FL/Fl_Box.H> |
63 #include <FL/Fl_Button.H> | 64 #include <FL/Fl_Button.H> |