Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-06-05 16:12:13 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed some OS/2-specific build problems (STR #185)

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3115 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet
2003-11-01 01:44:23 +00:00
parent e582a3e26b
commit 71d7776392
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGES
+1
View File
@@ -1,5 +1,6 @@
CHANGES IN FLTK 1.1.5rc1 CHANGES IN FLTK 1.1.5rc1
- Fixed some OS/2-specific build problems (STR #185)
- Calling Fl_Text_Display::buffer() with the same buffer - Calling Fl_Text_Display::buffer() with the same buffer
would cause an application to lockup (STR #196) would cause an application to lockup (STR #196)
- Some of the widgets could crash an application if the - Some of the widgets could crash an application if the
FL/math.h
+6 -6
View File
@@ -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). // Math header file for the Fast Light Tool Kit (FLTK).
// //
@@ -37,6 +37,10 @@
# include <math.h> # include <math.h>
# endif # endif
# ifdef __EMX__
# include <float.h>
# endif
# ifndef M_PI # ifndef M_PI
# define M_PI 3.14159265358979323846 # define M_PI 3.14159265358979323846
@@ -51,10 +55,6 @@
# define M_SQRT1_2 0.70710678118654752440 # define M_SQRT1_2 0.70710678118654752440
# endif // !M_SQRT2 # endif // !M_SQRT2
# ifdef __EMX__
# include <float.h>
# endif
# if (defined(WIN32) || defined(CRAY)) && !defined(__MINGW32__) && !defined(__MWERKS__) # if (defined(WIN32) || defined(CRAY)) && !defined(__MINGW32__) && !defined(__MWERKS__)
inline double rint(double v) {return floor(v+.5);} 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 $".
// //
fluid/Makefile
+3 -3
View File
@@ -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). # FLUID makefile for the Fast Light Tool Kit (FLTK).
# #
@@ -54,7 +54,7 @@ all: $(FLUID) fluid$(EXEEXT)
fluid$(EXEEXT): $(OBJECTS) ../lib/$(LIBNAME) ../lib/$(FLLIBNAME) \ fluid$(EXEEXT): $(OBJECTS) ../lib/$(LIBNAME) ../lib/$(FLLIBNAME) \
../lib/$(IMGLIBNAME) ../lib/$(IMGLIBNAME)
echo Linking $@... echo Linking $@...
$(CXX) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS) -lfltk_images $(IMAGELIBS) $(LDLIBS) $(CXX) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS) $(LINKFLTKIMG) $(LDLIBS)
$(POSTBUILD) $@ ../FL/mac.r $(POSTBUILD) $@ ../FL/mac.r
fluid-shared$(EXEEXT): $(OBJECTS) ../src/$(DSONAME) ../src/$(FLDSONAME) \ fluid-shared$(EXEEXT): $(OBJECTS) ../src/$(DSONAME) ../src/$(FLDSONAME) \
@@ -95,5 +95,5 @@ rebuild:
./fluid -c widget_panel.fl ./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 $".
# #