FLTK now builds with the current release of MinGW (STR #325, STR

#401, STR #402)


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3432 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

5 files changed, 15 insertions, 13 deletions

diff --git a/CHANGES b/CHANGES
index 75fa2a456..2b0e5e140 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
 CHANGES IN FLTK 1.1.5rc2
 
 	- Documentation updates (STR #365)
+	- FLTK now builds with the current release of MinGW (STR
+	  #325, STR #401, STR #402)
 	- FLTK now honors the numlock key state (STR #369)
 	- The Fl_Text_Display widget did not redraw selections
 	  when focus changed (STR #390)
diff --git a/configure.in b/configure.in
index 3d2978a1d..9d4f3a711 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl -*- sh -*-
 dnl the "configure" script is made from this by running GNU "autoconf"
 dnl
-dnl "$Id: configure.in,v 1.33.2.31.2.108 2004/04/11 04:38:53 easysw Exp $"
+dnl "$Id: configure.in,v 1.33.2.31.2.109 2004/06/01 14:49:51 easysw Exp $"
 dnl
 dnl Configuration script for the Fast Light Tool Kit (FLTK).
 dnl
@@ -35,7 +35,7 @@ dnl FLTK library versions...
 FL_MAJOR_VERSION=1
 FL_MINOR_VERSION=1
 FL_PATCH_VERSION=5
-FL_RELEASE_VERSION=rc1
+FL_RELEASE_VERSION=rc2
 FL_API_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION}
 
 AC_SUBST(FL_MAJOR_VERSION)
@@ -863,5 +863,5 @@ dnl Make sure the fltk-config script is executable...
 chmod +x fltk-config
 
 dnl
-dnl End of "$Id: configure.in,v 1.33.2.31.2.108 2004/04/11 04:38:53 easysw Exp $".
+dnl End of "$Id: configure.in,v 1.33.2.31.2.109 2004/06/01 14:49:51 easysw Exp $".
 dnl
diff --git a/fltk-config.in b/fltk-config.in
index f3687b33a..757bc1b56 100755
--- a/fltk-config.in
+++ b/fltk-config.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# "$Id: fltk-config.in,v 1.12.2.20 2004/04/11 04:38:53 easysw Exp $"
+# "$Id: fltk-config.in,v 1.12.2.21 2004/06/01 14:49:51 easysw Exp $"
 # 
 # FLTK configuration utility.
 #
@@ -177,7 +177,7 @@ fi
 # Calculate needed libraries
 LDSTATIC="$libdir/libfltk.a $LDLIBS"
 LDLIBS="$libs -lfltk$SHAREDSUFFIX $LDLIBS"
-LIBS="$LIBS $libdir/libfltk.a"
+LIBS="$LIBS $libs $libdir/libfltk.a"
 
 if test x$use_forms = xyes; then
     LDLIBS="-lfltk_forms$SHAREDSUFFIX $LDLIBS"
@@ -266,5 +266,5 @@ if test "$echo_libs" = "yes"; then
 fi
 
 #
-# End of "$Id: fltk-config.in,v 1.12.2.20 2004/04/11 04:38:53 easysw Exp $".
+# End of "$Id: fltk-config.in,v 1.12.2.21 2004/06/01 14:49:51 easysw Exp $".
 #
diff --git a/fltk.spec b/fltk.spec
index 8848a5a03..1a83e100f 100644
--- a/fltk.spec
+++ b/fltk.spec
@@ -1,5 +1,5 @@
 #
-# "$Id: fltk.spec,v 1.1.2.9.2.28 2004/04/11 04:38:53 easysw Exp $"
+# "$Id: fltk.spec,v 1.1.2.9.2.29 2004/06/01 14:49:51 easysw Exp $"
 #
 # RPM spec file for FLTK.
 #
@@ -23,7 +23,7 @@
 # Please report all bugs and problems to "fltk-bugs@fltk.org".
 #
 
-%define version 1.1.5rc1
+%define version 1.1.5rc2
 %define release 0
 %define prefix /usr
 
@@ -96,5 +96,5 @@ rm -rf $RPM_BUILD_ROOT
 %{prefix}/share/doc/fltk/*
 
 #
-# End of "$Id: fltk.spec,v 1.1.2.9.2.28 2004/04/11 04:38:53 easysw Exp $".
+# End of "$Id: fltk.spec,v 1.1.2.9.2.29 2004/06/01 14:49:51 easysw Exp $".
 #
diff --git a/makefiles/makeinclude.mingw b/makefiles/makeinclude.mingw
index ed0d00879..156b6fd2d 100644
--- a/makefiles/makeinclude.mingw
+++ b/makefiles/makeinclude.mingw
@@ -1,5 +1,5 @@
 #
-# "$Id: makeinclude.mingw,v 1.1.2.3.2.11 2002/07/14 17:03:31 easysw Exp $"
+# "$Id: makeinclude.mingw,v 1.1.2.3.2.12 2004/06/01 14:49:51 easysw Exp $"
 #
 # Make include file for the Fast Light Tool Kit (FLTK).
 # (this file for MingW using GCC 2.95.x)
@@ -89,8 +89,8 @@ IMGDSONAME	=
 DSOCOMMAND	= echo
 
 # libraries to link with (in addition to default libs):
-LDLIBS		=-mwindows -lgdi32 -lcomctl32 -lwsock32
-GLDLIBS		=-mwindows -lglu32 -lopengl32 -lgdi32 -lcomctl32 -lwsock32
+LDLIBS		=-mwindows -lole32 -luuid -lcomctl32 -lwsock32 -lsupc++
+GLDLIBS		=-mwindows -lglu32 -lopengl32 -lole32 -luuid -lcomctl32 -lwsock32 -lsupc++
 LINKFLTK	=-L../lib -lfltk
 LINKFLTKGL	=-L../lib -lfltk_gl
 LINKFLTKFORMS	=-L../lib -lfltk_forms -lfltk
@@ -122,5 +122,5 @@ THREADS		=threads
 	$(CXX) -I.. $(CXXFLAGS) $< -c
 
 #
-# End of "$Id: makeinclude.mingw,v 1.1.2.3.2.11 2002/07/14 17:03:31 easysw Exp $".
+# End of "$Id: makeinclude.mingw,v 1.1.2.3.2.12 2004/06/01 14:49:51 easysw Exp $".
 #