summaryrefslogtreecommitdiff
path: root/fltk-options
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 /fltk-options
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 'fltk-options')
-rw-r--r--fltk-options/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/fltk-options/Makefile b/fltk-options/Makefile
index 0c7c9c6da..06b3b710b 100644
--- a/fltk-options/Makefile
+++ b/fltk-options/Makefile
@@ -25,7 +25,7 @@ OBJECTS = $(CPPFILES:.cxx=.o)
all: $(FLTK_OPTIONS) fltk-options$(EXEEXT)
-fltk-options$(EXEEXT): $(OBJECTS) $(LIBNAME) $(FLLIBNAME)
+fltk-options$(EXEEXT): $(OBJECTS) $(LIBNAME)
echo Linking $@...
$(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKFLTKIMG) $(LDFLAGS) $(LDLIBS)
$(OSX_ONLY) $(RM) -r -f fltk-options.app
@@ -34,7 +34,7 @@ fltk-options$(EXEEXT): $(OBJECTS) $(LIBNAME) $(FLLIBNAME)
$(OSX_ONLY) $(INSTALL) icons/fltk-options.icns fltk-options.app/Contents/Resources
$(OSX_ONLY) $(INSTALL) fltk-options.plist fltk-options.app/Contents/Info.plist
-fltk-options-shared$(EXEEXT): $(OBJECTS) ../src/$(DSONAME) ../src/$(FLDSONAME)
+fltk-options-shared$(EXEEXT): $(OBJECTS) ../src/$(DSONAME)
echo Linking $@...
$(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKSHARED) $(LDFLAGS) $(LDLIBS)