summaryrefslogtreecommitdiff
path: root/src/fl_draw_image.cxx
diff options
context:
space:
mode:
authorAlbrecht Schlosser <albrechts.fltk@online.de>2016-01-27 23:57:53 +0000
committerAlbrecht Schlosser <albrechts.fltk@online.de>2016-01-27 23:57:53 +0000
commit48db7a07ef8e28dd4ab42b7bdc48669b503f354b (patch)
treec13e3b9c2c7ae03a0c24cb7a5fe976b07eb414ba /src/fl_draw_image.cxx
parent411e73fe242f66b26e98d8689ceb6f9b686c19f9 (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_draw_image.cxx')
-rw-r--r--src/fl_draw_image.cxx13
1 files changed, 12 insertions, 1 deletions
diff --git a/src/fl_draw_image.cxx b/src/fl_draw_image.cxx
index a4741c746..912063ccb 100644
--- a/src/fl_draw_image.cxx
+++ b/src/fl_draw_image.cxx
@@ -27,7 +27,14 @@
// defeat some of the shortcuts in translating the image for X.
// FIXME: use the correct macros for these conditions
-// FIXME: eventuay get rid of this file and use the source files as modules.
+// FIXME: eventually get rid of this file and use the source files as modules.
+
+// -----------------------------------------------------------------------------
+// Remove #ifndef FL_LIBRARY_CMAKE and the entire block of #include
+// statements when the new build system is ready:
+#ifndef FL_LIBRARY_CMAKE
+// -----------------------------------------------------------------------------
+
#ifdef WIN32
# include "drivers/GDI/Fl_GDI_Graphics_Driver_image.cxx"
#elif defined(__APPLE__)
@@ -36,6 +43,10 @@
# include "drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx"
#endif
+// -----------------------------------------------------------------------------
+#endif // FL_LIBRARY_CMAKE
+// -----------------------------------------------------------------------------
+
//
// End of "$Id$".
//