From 3346a9fee75faff9b8087513204cb63cfcf8ec0c Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Sun, 14 Jul 2002 17:03:31 +0000 Subject: Change the Fl_Group current, add, and remove methods so they are no longer inline; this should make shared libraries work better on all platforms. Link FLUID against shared libraries, too, so that the installed fluid is also using shared libraries (still make a statically linked fluid for the build) git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2525 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- FL/Fl_Export.H | 11 +++++------ FL/Fl_Group.H | 13 ++++--------- FL/Makefile.in | 36 ++++++++++++++++++------------------ 3 files changed, 27 insertions(+), 33 deletions(-) (limited to 'FL') diff --git a/FL/Fl_Export.H b/FL/Fl_Export.H index 3bdaab731..fb15a4e08 100644 --- a/FL/Fl_Export.H +++ b/FL/Fl_Export.H @@ -1,5 +1,5 @@ /* - * "$Id: Fl_Export.H,v 1.3.2.4 2002/07/11 22:43:52 matthiaswm Exp $" + * "$Id: Fl_Export.H,v 1.3.2.5 2002/07/14 17:03:30 easysw Exp $" * * WIN32 DLL export definitions for the Fast Light Tool Kit (FLTK). * @@ -27,11 +27,10 @@ # define Fl_Export_H /* - * The following is only used when building DLLs under WIN32 with Visual C++ - * or CodeWarrior... + * The following is only used when building DLLs under WIN32... */ -# if defined(FL_DLL) && ( defined(_MSC_VER) || defined(__MWERKS__) ) +# if defined(FL_DLL) && (defined(_MSC_VER) || defined(__MWERKS__) || defined(__BORLANDC__) || __GNUC__ >= 3) # ifdef FL_LIBRARY # define FL_EXPORT __declspec(dllexport) # else @@ -39,10 +38,10 @@ # endif /* FL_LIBRARY */ # else # define FL_EXPORT -# endif /* FL_DLL && ( _MSC_VER || __MWERKS__ ) */ +# endif /* FL_DLL */ #endif /* !Fl_Export_H */ /* - * End of "$Id: Fl_Export.H,v 1.3.2.4 2002/07/11 22:43:52 matthiaswm Exp $". + * End of "$Id: Fl_Export.H,v 1.3.2.5 2002/07/14 17:03:30 easysw Exp $". */ diff --git a/FL/Fl_Group.H b/FL/Fl_Group.H index 38df5c522..e5e2a1b34 100644 --- a/FL/Fl_Group.H +++ b/FL/Fl_Group.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Group.H,v 1.6.2.4.2.3 2002/07/11 22:43:52 matthiaswm Exp $" +// "$Id: Fl_Group.H,v 1.6.2.4.2.4 2002/07/14 17:03:30 easysw Exp $" // // Group header file for the Fast Light Tool Kit (FLTK). // @@ -52,15 +52,10 @@ protected: public: FL_EXPORT int handle(int); -#ifdef __MWERKS__ FL_EXPORT void begin(); FL_EXPORT void end(); -#else - void begin() {current_ = this;} - void end() {current_ = (Fl_Group*)parent();} -#endif - static Fl_Group *current() {return current_;} - static void current(Fl_Group *g) {current_ = g;} + FL_EXPORT static Fl_Group *current(); + FL_EXPORT static void current(Fl_Group *g); int children() const {return children_;} Fl_Widget* child(int n) const {return array()[n];} @@ -101,5 +96,5 @@ public: #endif // -// End of "$Id: Fl_Group.H,v 1.6.2.4.2.3 2002/07/11 22:43:52 matthiaswm Exp $". +// End of "$Id: Fl_Group.H,v 1.6.2.4.2.4 2002/07/14 17:03:30 easysw Exp $". // diff --git a/FL/Makefile.in b/FL/Makefile.in index e03def430..769ff9000 100644 --- a/FL/Makefile.in +++ b/FL/Makefile.in @@ -1,5 +1,5 @@ # -# "$Id: Makefile.in,v 1.1.2.5 2002/02/15 18:15:45 easysw Exp $" +# "$Id: Makefile.in,v 1.1.2.6 2002/07/14 17:03:30 easysw Exp $" # # Header makefile for the Fast Light Tool Kit (FLTK). # @@ -29,30 +29,30 @@ all: install: echo "Installing include files in $(includedir)..." - -mkdir -p $(includedir) - rm -rf $(includedir)/FL - mkdir $(includedir)/FL - chmod 755 $(includedir)/FL - cp ../FL/*.[hHr] $(includedir)/FL - chmod 644 $(includedir)/FL/*.[hHr] + -$(MKDIR) -p $(includedir) + $(RMDIR) $(includedir)/FL + $(MKDIR) $(includedir)/FL + $(CHMOD) 755 $(includedir)/FL + $(CP) ../FL/*.[hHr] $(includedir)/FL + $(CHMOD) 644 $(includedir)/FL/*.[hHr] @HLINKS@ cd $(includedir)/FL;\ @HLINKS@ for file in *.H; do\ -@HLINKS@ rm -f "`basename $$file H`h";\ -@HLINKS@ ln -s $$file "`basename $$file H`h";\ +@HLINKS@ $(RM) "`basename $$file H`h";\ +@HLINKS@ $(LN) $$file "`basename $$file H`h";\ @HLINKS@ done -@HLINKS@ rm -f $(includedir)/FL/fl_file_chooser.H -@HLINKS@ ln -s Fl_File_Chooser.H $(includedir)/FL/fl_file_chooser.H -@HLINKS@ rm -f $(includedir)/FL/fl_file_chooser.h -@HLINKS@ ln -s Fl_File_Chooser.H $(includedir)/FL/fl_file_chooser.h -@HLINKS@ rm -f $(includedir)/Fl -@HLINKS@ ln -s FL $(includedir)/Fl +@HLINKS@ $(RM) $(includedir)/FL/fl_file_chooser.H +@HLINKS@ $(LN) Fl_File_Chooser.H $(includedir)/FL/fl_file_chooser.H +@HLINKS@ $(RM) $(includedir)/FL/fl_file_chooser.h +@HLINKS@ $(LN) Fl_File_Chooser.H $(includedir)/FL/fl_file_chooser.h +@HLINKS@ $(RM) $(includedir)/Fl +@HLINKS@ $(LN) FL $(includedir)/Fl uninstall: echo "Uninstalling include files..." - rm -rf $(includedir)/FL -@HLINKS@ rm -f $(includedir)/Fl + $(RMDIR) $(includedir)/FL +@HLINKS@ $(RM) $(includedir)/Fl # -# End of "$Id: Makefile.in,v 1.1.2.5 2002/02/15 18:15:45 easysw Exp $". +# End of "$Id: Makefile.in,v 1.1.2.6 2002/07/14 17:03:30 easysw Exp $". # -- cgit v1.2.3