diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2016-04-05 23:33:04 +0000 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2016-04-05 23:33:04 +0000 |
| commit | 10993382622fed24b09b53039007f8e120b976d8 (patch) | |
| tree | c709eea9ec0010d28571c12dafd2cf4fa724d8ae /src | |
| parent | 020a96b4a89e5d9e38170a28bb9848519060bdca (diff) | |
Clean up Makefile and CMakeLists.txt
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11537 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 13 | ||||
| -rw-r--r-- | src/Makefile | 15 |
2 files changed, 20 insertions, 8 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2bdedcaa6..83588a4a4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -373,13 +373,16 @@ set (CFILES ) if (USE_X11) - set (CFILES - ${CFILES} - xutf8/utf8Input.c - xutf8/utf8Utils.c - xutf8/utf8Wrap.c + list (APPEND CFILES xutf8/keysym2Ucs.c ) + if (NOT USE_XFT) + list (APPEND CFILES + xutf8/utf8Utils.c + xutf8/utf8Wrap.c + # xutf8/utf8Input.c # not used + ) + endif (NOT USE_XFT) endif (USE_X11) if (APPLE AND (NOT OPTION_APPLE_X11) AND (NOT OPTION_APPLE_SDL)) diff --git a/src/Makefile b/src/Makefile index 01cd4d0b2..7f6ddcbc2 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,7 +1,7 @@ # # "$Id$" # -# Library makefile for the Fast Light Tool Kit (FLTK). +# Library Makefile for the Fast Light Tool Kit (FLTK). # # Copyright 1998-2016 by Bill Spitzak and others. # @@ -233,6 +233,7 @@ QUARTZCPPFILES = \ drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx \ drivers/Darwin/Fl_Darwin_System_Driver.cxx +# These C++ files are used under condition: BUILD_X11 XLIBCPPFILES = \ drivers/Xlib/Fl_Xlib_Graphics_Driver.cxx \ drivers/Xlib/Fl_Xlib_Graphics_Driver_arci.cxx \ @@ -253,18 +254,25 @@ XLIBCPPFILES = \ Fl_Native_File_Chooser_FLTK.cxx \ Fl_Native_File_Chooser_GTK.cxx +# This C file is used under condition: BUILD_X11 XLIBCFILES = \ - xutf8/keysym2Ucs.c \ - xutf8/utf8Input.c \ + xutf8/keysym2Ucs.c + +# These C files are used under condition: BUILD_X11 AND NOT BUILD_XFT +XLIBXCFILES = \ xutf8/utf8Utils.c \ xutf8/utf8Wrap.c +# xutf8/utf8Input.c # not used +# These C++ files are used under condition: BUILD_X11 AND NOT BUILD_XFT XLIBFONTFILES = \ drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.cxx +# These C++ files are used under condition: BUILD_X11 AND BUILD_XFT XLIBXFTFILES = \ drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.cxx +# These C++ files are used under condition: BUILD_GDI GDICPPFILES = \ drivers/GDI/Fl_GDI_Graphics_Driver.cxx \ drivers/GDI/Fl_GDI_Graphics_Driver_arci.cxx \ @@ -303,6 +311,7 @@ CPPFILES += $(shell if test $(BUILD_X11) = Yes -a $(BUILD_XFT) != Yes; then echo CPPFILES += $(shell if test $(BUILD_GDI) = Yes; then echo $(GDICPPFILES); fi) CFILES += $(shell if test $(BUILD_X11) = Yes; then echo $(XLIBCFILES); fi) +CFILES += $(shell if test $(BUILD_X11) = Yes -a $(BUILD_XFT) != Yes; then echo $(XLIBXCFILES); fi) OBJECTS = $(MMFILES:.mm=.o) $(CPPFILES:.cxx=.o) $(CFILES:.c=.o) $(UTF8CFILES:.c=.o) GLOBJECTS = $(GLCPPFILES:.cxx=.o) |