From 5df5daf78e135e0c8371012ffe56df5cae357755 Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Wed, 20 Dec 2023 16:56:29 +0100 Subject: 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. --- fluid/Makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'fluid') 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) -- cgit v1.2.3