diff options
| -rw-r--r-- | CHANGES | 1 | ||||
| -rw-r--r-- | FL/math.h | 12 | ||||
| -rw-r--r-- | fluid/Makefile | 6 |
3 files changed, 10 insertions, 9 deletions
@@ -1,5 +1,6 @@ CHANGES IN FLTK 1.1.5rc1 + - Fixed some OS/2-specific build problems (STR #185) - Calling Fl_Text_Display::buffer() with the same buffer would cause an application to lockup (STR #196) - Some of the widgets could crash an application if the @@ -1,5 +1,5 @@ // -// "$Id: math.h,v 1.4.2.4.2.9 2003/08/02 05:54:43 matthiaswm Exp $" +// "$Id: math.h,v 1.4.2.4.2.10 2003/11/01 01:44:23 easysw Exp $" // // Math header file for the Fast Light Tool Kit (FLTK). // @@ -37,6 +37,10 @@ # include <math.h> # endif +# ifdef __EMX__ +# include <float.h> +# endif + # ifndef M_PI # define M_PI 3.14159265358979323846 @@ -51,10 +55,6 @@ # define M_SQRT1_2 0.70710678118654752440 # endif // !M_SQRT2 -# ifdef __EMX__ -# include <float.h> -# endif - # if (defined(WIN32) || defined(CRAY)) && !defined(__MINGW32__) && !defined(__MWERKS__) inline double rint(double v) {return floor(v+.5);} @@ -66,5 +66,5 @@ inline double copysign(double a, double b) {return b<0 ? -a : a;} // -// End of "$Id: math.h,v 1.4.2.4.2.9 2003/08/02 05:54:43 matthiaswm Exp $". +// End of "$Id: math.h,v 1.4.2.4.2.10 2003/11/01 01:44:23 easysw Exp $". // diff --git a/fluid/Makefile b/fluid/Makefile index 143b3009f..1dfc5f8f7 100644 --- a/fluid/Makefile +++ b/fluid/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile,v 1.10.2.6.2.24 2003/08/02 21:17:30 easysw Exp $" +# "$Id: Makefile,v 1.10.2.6.2.25 2003/11/01 01:44:23 easysw Exp $" # # FLUID makefile for the Fast Light Tool Kit (FLTK). # @@ -54,7 +54,7 @@ all: $(FLUID) fluid$(EXEEXT) fluid$(EXEEXT): $(OBJECTS) ../lib/$(LIBNAME) ../lib/$(FLLIBNAME) \ ../lib/$(IMGLIBNAME) echo Linking $@... - $(CXX) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS) -lfltk_images $(IMAGELIBS) $(LDLIBS) + $(CXX) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS) $(LINKFLTKIMG) $(LDLIBS) $(POSTBUILD) $@ ../FL/mac.r fluid-shared$(EXEEXT): $(OBJECTS) ../src/$(DSONAME) ../src/$(FLDSONAME) \ @@ -95,5 +95,5 @@ rebuild: ./fluid -c widget_panel.fl # -# End of "$Id: Makefile,v 1.10.2.6.2.24 2003/08/02 21:17:30 easysw Exp $". +# End of "$Id: Makefile,v 1.10.2.6.2.25 2003/11/01 01:44:23 easysw Exp $". # |