diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-05-24 14:50:20 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-05-24 14:50:20 +0000 |
| commit | d1a1367fead1aeda3b6e97018baf3746ea817177 (patch) | |
| tree | 0cc6fb544aa725c08f5b3f13a7e590d35057ea7a | |
| parent | e0a7046b8036ae2ef4b2d3a602447c2b1c5b64a0 (diff) | |
MingW updates.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2255 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | CHANGES | 2 | ||||
| -rw-r--r-- | makefiles/config.mingw | 6 | ||||
| -rw-r--r-- | makefiles/makeinclude.mingw | 14 |
3 files changed, 15 insertions, 7 deletions
@@ -1,6 +1,8 @@ CHANGES IN FLTK 1.1.0rc3 - Documentation updates. + - Enabled the OpenGL and threads demos when compiling + for MingW. - Fl_File_Input didn't update the directory buttons if a callback was registered with the widget. - The file chooser would return the last selected diff --git a/makefiles/config.mingw b/makefiles/config.mingw index f89b5e0de..095fea8f9 100644 --- a/makefiles/config.mingw +++ b/makefiles/config.mingw @@ -1,5 +1,5 @@ /* - * "$Id: config.mingw,v 1.1.2.3.2.6 2002/05/21 18:13:31 easysw Exp $" + * "$Id: config.mingw,v 1.1.2.3.2.7 2002/05/24 14:50:20 easysw Exp $" * * Configuration file for the Fast Light Tool Kit (FLTK). * @@ -56,7 +56,7 @@ * library files. Consult the README.win32 file for further details. */ -#define HAVE_GL 0 +#define HAVE_GL 1 /* * HAVE_GL_GLU_H: @@ -216,5 +216,5 @@ /* - * End of "$Id: config.mingw,v 1.1.2.3.2.6 2002/05/21 18:13:31 easysw Exp $". + * End of "$Id: config.mingw,v 1.1.2.3.2.7 2002/05/24 14:50:20 easysw Exp $". */ diff --git a/makefiles/makeinclude.mingw b/makefiles/makeinclude.mingw index 23c2bdb9c..805692d15 100644 --- a/makefiles/makeinclude.mingw +++ b/makefiles/makeinclude.mingw @@ -1,5 +1,5 @@ # -# "$Id: makeinclude.mingw,v 1.1.2.3.2.5 2002/03/28 13:32:22 easysw Exp $" +# "$Id: makeinclude.mingw,v 1.1.2.3.2.6 2002/05/24 14:50:20 easysw Exp $" # # Make include file for the Fast Light Tool Kit (FLTK). # @@ -76,13 +76,19 @@ GLDSONAME = DSOCOMMAND = echo # libraries to link with (in addition to default libs): -LDLIBS = -lgdi32 -lcomctl32 -lwsock32 -GLDLIBS = -lglu32 -lopengl32 -lgdi32 -lcomctl32 -lwsock32 +LDLIBS =-mwindows -lgdi32 -lcomctl32 -lwsock32 +GLDLIBS =-mwindows -lglu32 -lopengl32 -lgdi32 -lcomctl32 -lwsock32 LINKFLTK =-L../lib -lfltk LINKFLTKGL =-L../lib -lfltk_gl LINKFLTKFORMS =-L../lib -lfltk_forms -lfltk IMAGELIBS = +# Do we build the OpenGL demos? +GLDEMOS =gldemos + +# Do we build the threads demo? +THREADS =threads + # Be quiet when building... .SILENT: @@ -102,5 +108,5 @@ IMAGELIBS = $(CXX) -I.. $(CXXFLAGS) $< -c # -# End of "$Id: makeinclude.mingw,v 1.1.2.3.2.5 2002/03/28 13:32:22 easysw Exp $". +# End of "$Id: makeinclude.mingw,v 1.1.2.3.2.6 2002/05/24 14:50:20 easysw Exp $". # |