summaryrefslogtreecommitdiff
path: root/fluid
diff options
context:
space:
mode:
authorAlbrecht Schlosser <albrechts.fltk@online.de>2023-12-20 16:56:29 +0100
committerAlbrecht Schlosser <albrechts.fltk@online.de>2023-12-20 17:33:37 +0100
commit5df5daf78e135e0c8371012ffe56df5cae357755 (patch)
treeafd619b32d1f35b949f07b9dd35f0184400a1f93 /fluid
parent9023648e6c182a4142894b3e6c1b309b699b0629 (diff)
Make the 'Forms' compatibility library 'fltk_forms' optional
This library is no longer needed in FLTK itself. There is only one demo program (test/forms.cxx) that uses it if it is built. The demo program displays a message if fltk_forms is not available. The default is 'enabled' for backwards compatibility but this may be changed to 'disabled' in a future version.
Diffstat (limited to 'fluid')
-rw-r--r--fluid/Makefile6
1 files changed, 2 insertions, 4 deletions
diff --git a/fluid/Makefile b/fluid/Makefile
index 0fa834ebf..75a785e71 100644
--- a/fluid/Makefile
+++ b/fluid/Makefile
@@ -66,8 +66,7 @@ OBJECTS = $(CPPFILES:.cxx=.o)
all: $(FLUID) fluid$(EXEEXT)
-fluid$(EXEEXT): $(OBJECTS) $(LIBNAME) $(FLLIBNAME) \
- $(IMGLIBNAME)
+fluid$(EXEEXT): $(OBJECTS) $(LIBNAME) $(IMGLIBNAME)
echo Linking $@...
$(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKFLTKIMG) $(LDFLAGS) $(LDLIBS)
$(OSX_ONLY) $(RM) -r -f fluid.app
@@ -76,8 +75,7 @@ fluid$(EXEEXT): $(OBJECTS) $(LIBNAME) $(FLLIBNAME) \
$(OSX_ONLY) $(INSTALL) icons/fluid.icns fluid.app/Contents/Resources
$(OSX_ONLY) $(INSTALL) fluid.plist fluid.app/Contents/Info.plist
-fluid-shared$(EXEEXT): $(OBJECTS) ../src/$(DSONAME) ../src/$(FLDSONAME) \
- ../src/$(IMGDSONAME)
+fluid-shared$(EXEEXT): $(OBJECTS) ../src/$(DSONAME) ../src/$(IMGDSONAME)
echo Linking $@...
$(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKSHARED) $(LDFLAGS) $(LDLIBS)