diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2017-02-15 20:28:13 +0000 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2017-02-15 20:28:13 +0000 |
| commit | 66cdcfcd1b7b388ac5e9a539c2a74442d9df131c (patch) | |
| tree | 6c0f4e0227401b9c7d50530a7a6744df317b7dbd /fluid/Makefile | |
| parent | 1e5826e84b17c341364fb4f61cefaefa288b8c9b (diff) | |
Fluid: Fix platform-specific build system (CMake + configure).
Don't compile "empty" file (avoid warning: empty translation unit).
Add '-u' (update) command switch to 'make rebuild'.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12173 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'fluid/Makefile')
| -rw-r--r-- | fluid/Makefile | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/fluid/Makefile b/fluid/Makefile index 4423c6934..1100c9a3b 100644 --- a/fluid/Makefile +++ b/fluid/Makefile @@ -3,7 +3,7 @@ # # FLUID makefile for the Fast Light Tool Kit (FLTK). # -# Copyright 1998-2016 by Bill Spitzak and others. +# Copyright 1998-2017 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 @@ -16,10 +16,10 @@ # http://www.fltk.org/str.php # +include ../makeinclude + CPPFILES = \ CodeEditor.cxx \ - ExternalCodeEditor_UNIX.cxx \ - ExternalCodeEditor_WIN32.cxx \ Fl_Function_Type.cxx \ Fl_Group_Type.cxx \ Fl_Menu_Type.cxx \ @@ -39,12 +39,19 @@ CPPFILES = \ undo.cxx \ widget_panel.cxx +# ExternalCodeEditor: platform specific files + +CPPFILES_WIN = ExternalCodeEditor_WIN32.cxx +CPPFILES_OSX = ExternalCodeEditor_UNIX.cxx +CPPFILES_X11 = ExternalCodeEditor_UNIX.cxx +CPPFILES_XFT = ExternalCodeEditor_UNIX.cxx + +CPPFILES += $(CPPFILES_$(BUILD)) + ################################################################ OBJECTS = $(CPPFILES:.cxx=.o) -include ../makeinclude - all: $(FLUID) fluid$(EXEEXT) fluid$(EXEEXT): $(OBJECTS) $(LIBNAME) $(FLLIBNAME) \ @@ -116,12 +123,12 @@ uninstall-osx: # rebuild: - ./fluid -c about_panel.fl - ./fluid -c alignment_panel.fl - ./fluid -c function_panel.fl - ./fluid -c print_panel.fl - ./fluid -c template_panel.fl - ./fluid -c widget_panel.fl + ./fluid -u -c about_panel.fl + ./fluid -u -c alignment_panel.fl + ./fluid -u -c function_panel.fl + ./fluid -u -c print_panel.fl + ./fluid -u -c template_panel.fl + ./fluid -u -c widget_panel.fl # # End of "$Id$". |