diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2016-01-27 23:57:53 +0000 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2016-01-27 23:57:53 +0000 |
| commit | 48db7a07ef8e28dd4ab42b7bdc48669b503f354b (patch) | |
| tree | c13e3b9c2c7ae03a0c24cb7a5fe976b07eb414ba /src/fl_color.cxx | |
| parent | 411e73fe242f66b26e98d8689ceb6f9b686c19f9 (diff) | |
Modify Xlib driver code not to #include source files.
Adjusted CMake build, and with some additional temporary #ifdef's
the old Linux Makefile system works as well.
Defined FL_LIBRARY_CMAKE for now - will be removed later.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11067 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/fl_color.cxx')
| -rw-r--r-- | src/fl_color.cxx | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/fl_color.cxx b/src/fl_color.cxx index d2d737bbb..e0aa7bd3f 100644 --- a/src/fl_color.cxx +++ b/src/fl_color.cxx @@ -23,6 +23,7 @@ // Implementation of fl_color(i), fl_color(r,g,b). +# include <FL/Fl.H> #include <FL/Fl_Device.H> #include <FL/Fl.H> #include <config.h> @@ -30,6 +31,10 @@ // Apple Quartz driver in "drivers/Quartz/Fl_Quartz_Graphics_Driver_color.cxx" +// Remove #ifndef FL_LIBRARY_CMAKE and the entire block of #include +// statements when the new build system is ready: +#ifndef FL_LIBRARY_CMAKE +// ----------------------------------------------------------------------------- static unsigned fl_cmap[256] = { #include "fl_cmap.h" // this is a file produced by "cmap.cxx": @@ -58,9 +63,18 @@ static unsigned fl_cmap[256] = { // ----------------------------------------------------------------------------- +#endif // FL_LIBRARY_CMAKE + +// ----------------------------------------------------------------------------- + /** \addtogroup fl_attributes @{ */ +/* static */ +unsigned fl_cmap[256] = { +#include "fl_cmap.h" // this is a file produced by "cmap.cxx": +}; + /** Returns the RGB value(s) for the given FLTK color index. |