8 files changed, 35 insertions, 24 deletions
diff --git a/src/Makefile b/src/Makefile
index a4ed6e2bc..8797e790b 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -3,7 +3,7 @@
 #
 # Library makefile for the Fast Light Tool Kit (FLTK).
 #
-# Copyright 1998-2014 by Bill Spitzak and others.
+# Copyright 1998-2016 by Bill Spitzak and others.
 #
 # This library is free software. Distribution and use rights are outlined in
 # the file "COPYING" which should have been included with this file.  If this
@@ -226,32 +226,42 @@ QUARTZCPPFILES = \
 	drivers/Quartz/Fl_Quartz_Graphics_Driver_arci.cxx \
 	drivers/Quartz/Fl_Quartz_Graphics_Driver_line_style.cxx
 
-#  FIXME:
-#  ------
-#  Prepared, but not yet used: Xlib graphics driver files. These files
-#  are (still) #included, but should be compiled directly. We need to
-#  take care of ...font_x.cxx and ...font_xft.cxx - only one of these
-#  files must be compiled and linked.
-#
 XLIBCPPFILES = \
-	drivers/Xlib/Fl_Xlib_Graphics_Driver.cxx \
+	drivers/Xlib/Fl_Xlib_Graphics_Driver_arci.cxx \
 	drivers/Xlib/Fl_Xlib_Graphics_Driver_color.cxx \
-	drivers/Xlib/Fl_Xlib_Graphics_Driver_rect.cxx \
-	drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.cxx \
-	drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.cxx \
-	drivers/Xlib/Fl_Xlib_Graphics_Driver_vertex.cxx \
 	drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx \
-	drivers/Xlib/Fl_Xlib_Printer_Graphics_Driver.cxx \
-	drivers/Xlib/Fl_Xlib_Graphics_Driver_arci.cxx \
-	drivers/Xlib/Fl_Xlib_Graphics_Driver_line_style.cxx
+	drivers/Xlib/Fl_Xlib_Graphics_Driver_line_style.cxx \
+	drivers/Xlib/Fl_Xlib_Graphics_Driver_rect.cxx \
+	drivers/Xlib/Fl_Xlib_Graphics_Driver_vertex.cxx
+
+XLIBFONTFILES = \
+	drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.cxx
 
+XLIBXFTFILES = \
+	drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.cxx
+
+GDICPPFILES = \
+	drivers/GDI/Fl_GDI_Graphics_Driver_arci.cxx \
+	drivers/GDI/Fl_GDI_Graphics_Driver_color.cxx \
+	drivers/GDI/Fl_GDI_Graphics_Driver_font.cxx \
+	drivers/GDI/Fl_GDI_Graphics_Driver_image.cxx \
+	drivers/GDI/Fl_GDI_Graphics_Driver_line_style.cxx \
+	drivers/GDI/Fl_GDI_Graphics_Driver_rect.cxx \
+	drivers/GDI/Fl_GDI_Graphics_Driver_vertex.cxx
 
 ################################################################
 FLTKFLAGS = -DFL_LIBRARY
 include ../makeinclude
 
-CPPFILES += $(shell if test $(USEMMFILES) = Yes; then echo $(QUARTZCPPFILES); fi)
 MMFILES = $(shell if test $(USEMMFILES) = Yes; then echo $(OBJCPPFILES); fi)
+CPPFILES += $(shell if test $(USEMMFILES) = Yes; then echo $(QUARTZCPPFILES); fi)
+
+CPPFILES += $(shell if test $(BUILD_X11) = Yes; then echo $(XLIBCPPFILES); fi)
+CPPFILES += $(shell if test $(BUILD_X11) = Yes -a $(BUILD_XFT) = Yes; then echo $(XLIBXFTFILES); fi)
+CPPFILES += $(shell if test $(BUILD_X11) = Yes -a $(BUILD_XFT) != Yes; then echo $(XLIBFONTFILES); fi)
+
+# CPPFILES += $(shell if test $(BUILD_GDI) = Yes; then echo $(GDICPPFILES); fi)
+
 
 OBJECTS =  $(MMFILES:.mm=.o) $(CPPFILES:.cxx=.o) $(CFILES:.c=.o) $(UTF8CFILES:.c=.o)
 GLOBJECTS = $(GLCPPFILES:.cxx=.o)
@@ -501,6 +511,7 @@ mgwfltknox_images-$(FL_DSO_VERSION).dll: $(IMGLIBNAME) mgwfltknox-$(FL_DSO_VERSI
 
 clean:
 	-$(RM) *.o xutf8/*.o *.dll.a core.* *~ *.bak *.bck
+	-$(RM) drivers/GDI/*.o drivers/OpenGL/*.o drivers/Quartz/*.o drivers/Xlib/*.o
 	-$(RM) $(DSONAME) $(FLDSONAME) $(GLDSONAME) $(IMGDSONAME) \
 		$(LIBNAME) $(FLLIBNAME) $(GLLIBNAME) \
 		$(IMGLIBNAME) \
diff --git a/src/fl_arci.cxx b/src/fl_arci.cxx
index 955e9f32a..ce07ba414 100644
--- a/src/fl_arci.cxx
+++ b/src/fl_arci.cxx
@@ -58,7 +58,7 @@
 
 #ifdef FL_CFG_GFX_XLIB
 
-# include "drivers/Xlib/Fl_Xlib_Graphics_Driver_arci.cxx"
+// # include "drivers/Xlib/Fl_Xlib_Graphics_Driver_arci.cxx"
 
 #endif
 
diff --git a/src/fl_color.cxx b/src/fl_color.cxx
index d98db309e..a78db838f 100644
--- a/src/fl_color.cxx
+++ b/src/fl_color.cxx
@@ -60,7 +60,7 @@ unsigned fl_cmap[256] = {
 
 #ifdef FL_CFG_GFX_XLIB
 
-# include "drivers/Xlib/Fl_Xlib_Graphics_Driver_color.cxx"
+// # include "drivers/Xlib/Fl_Xlib_Graphics_Driver_color.cxx"
 
 #endif
 
diff --git a/src/fl_draw_image.cxx b/src/fl_draw_image.cxx
index 912063ccb..9ea1747b3 100644
--- a/src/fl_draw_image.cxx
+++ b/src/fl_draw_image.cxx
@@ -40,7 +40,7 @@
 #elif defined(__APPLE__)
 // Apple Quartz driver in "drivers/Quartz/Fl_Quartz_Graphics_Driver_image.cxx"
 #else
-#  include "drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx"
+// #  include "drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx"
 #endif
 
 // -----------------------------------------------------------------------------
diff --git a/src/fl_font.cxx b/src/fl_font.cxx
index 501fb3f02..51761de71 100644
--- a/src/fl_font.cxx
+++ b/src/fl_font.cxx
@@ -60,7 +60,7 @@
 #elif defined(FL_PORTING)
 #  pragma message "FL_PORTING: implement font handling specifics in its own file"
 #else
-#  include "drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.cxx"
+// #  include "drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.cxx"
 #endif // WIN32
 
 #endif // FL_LIBRARY_CMAKE
diff --git a/src/fl_line_style.cxx b/src/fl_line_style.cxx
index 6b44256d3..207177f92 100644
--- a/src/fl_line_style.cxx
+++ b/src/fl_line_style.cxx
@@ -58,7 +58,7 @@ int fl_line_width_ = 0;
 
 #ifdef FL_CFG_GFX_XLIB
 
-# include "drivers/Xlib/Fl_Xlib_Graphics_Driver_line_style.cxx"
+// # include "drivers/Xlib/Fl_Xlib_Graphics_Driver_line_style.cxx"
 
 #endif
 
diff --git a/src/fl_rect.cxx b/src/fl_rect.cxx
index 44b303f83..a57adf90b 100644
--- a/src/fl_rect.cxx
+++ b/src/fl_rect.cxx
@@ -88,7 +88,7 @@ Fl_Region Fl_Graphics_Driver::clip_region() {
 
 #ifdef FL_CFG_GFX_XLIB
 
-# include "drivers/Xlib/Fl_Xlib_Graphics_Driver_rect.cxx"
+// # include "drivers/Xlib/Fl_Xlib_Graphics_Driver_rect.cxx"
 
 #endif
 
diff --git a/src/fl_vertex.cxx b/src/fl_vertex.cxx
index 5ff5f644e..f05b2597e 100644
--- a/src/fl_vertex.cxx
+++ b/src/fl_vertex.cxx
@@ -170,7 +170,7 @@ void Fl_Graphics_Driver::fixloop() {  // remove equal points from closed path
 
 #ifdef FL_CFG_GFX_XLIB
 
-# include "drivers/Xlib/Fl_Xlib_Graphics_Driver_vertex.cxx"
+// # include "drivers/Xlib/Fl_Xlib_Graphics_Driver_vertex.cxx"
 
 #endif