diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2016-01-29 01:05:18 +0000 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2016-01-29 01:05:18 +0000 |
| commit | 6b8570c72c723e0a91fe1f66274b51b44a9b2c93 (patch) | |
| tree | 8d675975a4d42d829c2c5674f85378f656dbe2d4 /src/Makefile | |
| parent | 7728bf91e674cfb2fd2ccb09c5b87df3332686ea (diff) | |
Update Makefile to compile only needed Xlib driver files.
Commented out #include statements of Xlib driver files.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11080 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Makefile')
| -rw-r--r-- | src/Makefile | 45 |
1 files changed, 28 insertions, 17 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) \ |