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_font.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_font.cxx')
| -rw-r--r-- | src/fl_font.cxx | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/fl_font.cxx b/src/fl_font.cxx index 38088d69f..501fb3f02 100644 --- a/src/fl_font.cxx +++ b/src/fl_font.cxx @@ -45,6 +45,12 @@ #include <stdio.h> #include <stdlib.h> +// ----------------------------------------------------------------------------- +// 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_font.cxx" #elif defined(__APPLE__) @@ -57,6 +63,10 @@ # include "drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.cxx" #endif // WIN32 +#endif // FL_LIBRARY_CMAKE + +// ----------------------------------------------------------------------------- + #if defined(WIN32) || defined(__APPLE__) #elif defined(FL_PORTING) # pragma message "FL_PORTING: do you need the XFontStruct" |