More CygWin stuff, and a fix for WIN32 with the new fl_beep() function.

Add a new "migration" appendix to the FLTK manual. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1695 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
author: Michael R Sweet <michael.r.sweet@gmail.com> 2001-11-18 12:48:38 +0000
committer: Michael R Sweet <michael.r.sweet@gmail.com> 2001-11-18 12:48:38 +0000
commit: 8b5a03d3a2a9927609d41127fd6d639fe961a46f (patch)
tree: 02cd767ff039c36bdadb95ba3bfeacb4552d2669
parent: f21f8f8993e11d5561c434d118a7477363f4eb96 (diff)
9 files changed, 109 insertions, 49 deletions
diff --git a/configure.in b/configure.in
index e2cd5451f..fbbb79252 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.22 2001/11/17 15:55:36 easysw Exp $"
+dnl "$Id: configure.in,v 1.33.2.31.2.23 2001/11/18 12:48:38 easysw Exp $"
 dnl
 dnl Configuration script for the Fast Light Tool Kit (FLTK).
 dnl
@@ -208,12 +208,14 @@ AC_CHECK_HEADER(png.h,
 dnl Restore original LIBS settings...
 LIBS="$SAVELIBS"
 
+EXEEXT=
 case $uname in
     CYGWIN*)
 	dnl Cygwin environment...
 	LIBS="$LIBS -lgdi32 -lwsock32"
 	CFLAGS="$CFLAGS -DWIN32"
 	CXXFLAGS="$CXXFLAGS -DWIN32"
+	EXEEXT=".exe"
 	if test x$enable_gl != xno; then
 	    AC_CHECK_HEADER(GL/gl.h,
 	        AC_DEFINE(HAVE_GL)
@@ -302,6 +304,7 @@ case $uname in
 	;;
 esac
 
+AC_SUBST(EXEEXT)
 AC_SUBST(GLDEMOS)
 AC_SUBST(GLLIB)
 
@@ -518,5 +521,5 @@ AC_OUTPUT(makeinclude fltk-config)
 chmod +x fltk-config
 
 dnl
-dnl End of "$Id: configure.in,v 1.33.2.31.2.22 2001/11/17 15:55:36 easysw Exp $".
+dnl End of "$Id: configure.in,v 1.33.2.31.2.23 2001/11/18 12:48:38 easysw Exp $".
 dnl
diff --git a/documentation/fltk.book b/documentation/fltk.book
index e56572c26..79fc90d23 100644
--- a/documentation/fltk.book
+++ b/documentation/fltk.book
@@ -76,4 +76,5 @@ enumerations.html
 glut.html
 forms.html
 osissues.html
+migration.html
 license.html
diff --git a/documentation/index.html b/documentation/index.html
index 2f27c7f71..79a8f83b8 100644
--- a/documentation/index.html
+++ b/documentation/index.html
@@ -87,7 +87,10 @@
 	<B><A HREF="osissues.html#osissues">F - Operating System Issues</A></B>
 	<BR>
 	<BR>
-	<B><A HREF="license.html#license">G - Software License</A></B>
+	<B><A HREF="migration.html">G - Migrating Code from FLTK 1.0.x</A></B>
+	<BR>
+	<BR>
+	<B><A HREF="license.html#license">H - Software License</A></B>
 	</TD>
 </TR>
 </TABLE>
diff --git a/documentation/license.html b/documentation/license.html
index 019038a1d..78b484e0f 100644
--- a/documentation/license.html
+++ b/documentation/license.html
@@ -1,5 +1,5 @@
 <HTML><BODY>
-<H1 ALIGN=RIGHT><A NAME=license>G - Software License</A></H1>
+<H1 ALIGN=RIGHT><A NAME=license>H - Software License</A></H1>
 <P ALIGN=CENTER><BIG>GNU LIBRARY GENERAL PUBLIC LICENSE</BIG></P>
 <P ALIGN=CENTER>Version 2, June 1991
 <BR> Copyright (C) 1991 Free Software Foundation, Inc.
diff --git a/fltk-config.in b/fltk-config.in
index ce8b11444..7ba4b9d1b 100755
--- a/fltk-config.in
+++ b/fltk-config.in
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# "$Id: fltk-config.in,v 1.12.2.2 2001/11/01 17:28:36 easysw Exp $"
+# "$Id: fltk-config.in,v 1.12.2.3 2001/11/18 12:48:38 easysw Exp $"
 # 
 # FLTK configuration utility.
 #
@@ -49,7 +49,7 @@ CC="@CC@"
 CFLAGS="@CFLAGS@"
 CXXFLAGS="@CXXFLAGS@"
 LDFLAGS="@LDFLAGS@"
-LDLIBS="@LDFLAGS@ @LIBS@ -lX11 -lXext @X_EXTRA_LIBS@"
+LDLIBS="@LDFLAGS@ @LIBS@"
 
 # program to make the archive:
 LIBNAME="@LIBNAME@"
diff --git a/fluid/Makefile b/fluid/Makefile
index 88dbd5de4..e814f10af 100644
--- a/fluid/Makefile
+++ b/fluid/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.10.2.6.2.3 2001/08/11 16:09:26 easysw Exp $"
+# "$Id: Makefile,v 1.10.2.6.2.4 2001/11/18 12:48:38 easysw Exp $"
 #
 # Fluid makefile for the Fast Light Tool Kit (FLTK).
 #
@@ -23,7 +23,7 @@
 # Please report all bugs and problems to "fltk-bugs@fltk.org".
 #
 
-PROGRAM = fluid
+PROGRAM = fluid$(EXEEXT)
 
 CPPFILES = \
 	Fl_Function_Type.cxx \
@@ -86,5 +86,5 @@ rebuild:
 	./fluid -c widget_panel.fl
 
 #
-# End of "$Id: Makefile,v 1.10.2.6.2.3 2001/08/11 16:09:26 easysw Exp $".
+# End of "$Id: Makefile,v 1.10.2.6.2.4 2001/11/18 12:48:38 easysw Exp $".
 #
diff --git a/makeinclude.in b/makeinclude.in
index a2801fce3..ba6219151 100644
--- a/makeinclude.in
+++ b/makeinclude.in
@@ -1,5 +1,5 @@
 #
-# "$Id: makeinclude.in,v 1.7.2.11.2.5 2001/11/17 15:55:36 easysw Exp $"
+# "$Id: makeinclude.in,v 1.7.2.11.2.6 2001/11/18 12:48:38 easysw Exp $"
 #
 # Make include file for the Fast Light Tool Kit (FLTK).
 # @configure_input@
@@ -67,6 +67,9 @@ IMAGELIBS	=@IMAGELIBS@
 # Do we build the OpenGL demos?
 GLDEMOS		=@GLDEMOS@
 
+# The extension to use for executables...
+EXEEXT		=@EXEEXT@
+
 # Man page extensions...
 CAT1EXT		=@CAT1EXT@
 CAT3EXT		=@CAT3EXT@
@@ -75,9 +78,9 @@ CAT3EXT		=@CAT3EXT@
 .SILENT:
 
 # Build commands and filename extensions...
-.SUFFIXES:	.0 .1 .3 .c .cxx .h .fl .man .o .z
+.SUFFIXES:	.0 .1 .3 .c .cxx .h .fl .man .o .z $(EXEEXT)
 
-.cxx:
+$(EXEEXT).cxx:
 	echo Compiling and linking $@...
 	$(CXX) -I.. $(CXXFLAGS) $< $(LINKFLTK) $(LDLIBS) -o $@
 
@@ -102,5 +105,5 @@ CAT3EXT		=@CAT3EXT@
 	mv t.z $@
 
 #
-# End of "$Id: makeinclude.in,v 1.7.2.11.2.5 2001/11/17 15:55:36 easysw Exp $".
+# End of "$Id: makeinclude.in,v 1.7.2.11.2.6 2001/11/18 12:48:38 easysw Exp $".
 #
diff --git a/src/fl_ask.cxx b/src/fl_ask.cxx
index f08014a07..d6691a3fd 100644
--- a/src/fl_ask.cxx
+++ b/src/fl_ask.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: fl_ask.cxx,v 1.8.2.8.2.1 2001/11/17 16:37:48 easysw Exp $"
+// "$Id: fl_ask.cxx,v 1.8.2.8.2.2 2001/11/18 12:48:38 easysw Exp $"
 //
 // Standard dialog functions for the Fast Light Tool Kit (FLTK).
 //
@@ -127,7 +127,7 @@ static int innards(const char* fmt, va_list ap,
   return r;
 }
 
-// pointers you can use to change fltk to a foreign language:
+// pointers you can use to change FLTK to a foreign language:
 const char* fl_no = "No";
 const char* fl_yes= "Yes";
 const char* fl_ok = "OK";
@@ -139,16 +139,16 @@ void fl_beep(int type) {
   switch (type) {
     case FL_BEEP_QUESTION :
     case FL_BEEP_PASSWORD :
-      MessageBeep(MD_ICONQUESTION);
+      MessageBeep(MB_ICONQUESTION);
       break;
     case FL_BEEP_MESSAGE :
-      MessageBeep(MD_ICONASTERISK);
+      MessageBeep(MB_ICONASTERISK);
       break;
     case FL_BEEP_NOTIFICATION :
-      MessageBeep(MD_ICONASTERISK);
+      MessageBeep(MB_ICONASTERISK);
       break;
     default :
-      MessageBeep(MD_ICONERROR);
+      MessageBeep(MB_ICONERROR);
       break;
   }
 #else
@@ -256,5 +256,5 @@ const char *fl_password(const char *fmt, const char *defstr, ...) {
 }
 
 //
-// End of "$Id: fl_ask.cxx,v 1.8.2.8.2.1 2001/11/17 16:37:48 easysw Exp $".
+// End of "$Id: fl_ask.cxx,v 1.8.2.8.2.2 2001/11/18 12:48:38 easysw Exp $".
 //
diff --git a/test/Makefile b/test/Makefile
index 257127c30..af484dc04 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.19.2.7.2.7 2001/11/17 15:27:15 easysw Exp $"
+# "$Id: Makefile,v 1.19.2.7.2.8 2001/11/18 12:48:38 easysw Exp $"
 #
 # Test/example program makefile for the Fast Light Tool Kit (FLTK).
 #
@@ -41,16 +41,66 @@ CPPFILES =\
 	valuators.cxx fast_slow.cxx resize.cxx pack.cxx \
 	inactive.cxx line_style.cxx
 
-ALL =	adjuster arc ask bitmap boxtype browser button buttons \
-	checkers clock colbrowser color_chooser cursor curve \
-	demo doublebuffer editor file_chooser fonts forms hello \
-	help iconize image input keyboard label list_visuals \
-	mandelbrot menubar message minimum navigation output \
-	overlay pixmap pixmap_browser radio resizebox scroll \
-	subwindow symbols tabs tile valuators fast_slow resize \
-	pack inactive line_style
-
-GLALL =	CubeView cube fullscreen fractals gl_overlay glpuzzle shiny shape
+ALL =	\
+	adjuster$(EXEEXT) \
+	arc$(EXEEXT) \
+	ask$(EXEEXT) \
+	bitmap$(EXEEXT) \
+	boxtype$(EXEEXT) \
+	browser$(EXEEXT) \
+	button$(EXEEXT) \
+	buttons$(EXEEXT) \
+	checkers$(EXEEXT) \
+	clock$(EXEEXT) \
+	colbrowser$(EXEEXT) \
+	color_chooser$(EXEEXT) \
+	cursor$(EXEEXT) \
+	curve$(EXEEXT) \
+	demo$(EXEEXT) \
+	doublebuffer$(EXEEXT) \
+	editor$(EXEEXT) \
+	fast_slow$(EXEEXT) \
+	file_chooser$(EXEEXT) \
+	fonts$(EXEEXT) \
+	forms$(EXEEXT) \
+	hello$(EXEEXT) \
+	help$(EXEEXT) \
+	iconize$(EXEEXT) \
+	image$(EXEEXT) \
+	inactive$(EXEEXT) \
+	input$(EXEEXT) \
+	keyboard$(EXEEXT) \
+	label$(EXEEXT) \
+	line_style$(EXEEXT) \
+	list_visuals$(EXEEXT) \
+	mandelbrot$(EXEEXT) \
+	menubar$(EXEEXT) \
+	message$(EXEEXT) \
+	minimum$(EXEEXT) \
+	navigation$(EXEEXT) \
+	output$(EXEEXT) \
+	overlay$(EXEEXT) \
+	pack$(EXEEXT) \
+	pixmap$(EXEEXT) \
+	pixmap_browser$(EXEEXT) \
+	radio$(EXEEXT) \
+	resizebox$(EXEEXT) \
+	scroll$(EXEEXT) \
+	subwindow$(EXEEXT) \
+	symbols$(EXEEXT) \
+	tabs$(EXEEXT) \
+	tile$(EXEEXT) \
+	valuators$(EXEEXT)
+
+GLALL = \
+	cube$(EXEEXT) \
+	CubeView$(EXEEXT) \
+	fractals$(EXEEXT) \
+	fullscreen$(EXEEXT) \
+	gl_overlay$(EXEEXT) \
+	glpuzzle$(EXEEXT) \
+	shape$(EXEEXT) \
+	shiny$(EXEEXT) \
 
 all:	$(ALL) $(GLDEMOS)
 
@@ -61,7 +111,7 @@ gldemos:	$(GLALL)
 	echo Generating $<...
 	../fluid/fluid -c $<
 
-.fl:
+$(EXEEXT).fl:
 	echo Generating, compiling, and linking $@...
 	../fluid/fluid -c $<
 	$(CXX) -I.. $(CXXFLAGS) $@.cxx $(LINKFLTK) $(LDLIBS) -o $@
@@ -70,60 +120,60 @@ gldemos:	$(GLALL)
 $(ALL):  ../lib/$(LIBNAME)
 
 # Programs needing special instructions...
-editor: editor.cxx
+editor$(EXEEXT): editor.cxx
 	echo Compiling and linking $@...
 	$(CXX) -I.. $(CXXFLAGS) editor.cxx -o $@ $(LINKFLTK) $(LDLIBS) $(IMAGELIBS)
-file_chooser: file_chooser.cxx
+file_chooser$(EXEEXT): file_chooser.cxx
 	echo Compiling and linking $@...
 	$(CXX) -I.. $(CXXFLAGS) file_chooser.cxx -o $@ $(LINKFLTK) $(LDLIBS) $(IMAGELIBS)
-help: help.cxx
+help$(EXEEXT): help.cxx
 	echo Compiling and linking $@...
 	$(CXX) -I.. $(CXXFLAGS) help.cxx -o $@ $(LINKFLTK) $(LDLIBS) $(IMAGELIBS)
-keyboard: keyboard.cxx keyboard_ui.cxx
+keyboard$(EXEEXT): keyboard.cxx keyboard_ui.cxx
 	echo Compiling and linking $@...
 	$(CXX) -I.. $(CXXFLAGS) keyboard.cxx $(LINKFLTK) $(LDLIBS) -o $@
-mandelbrot: mandelbrot.cxx mandelbrot_ui.cxx
+mandelbrot$(EXEEXT): mandelbrot.cxx mandelbrot_ui.cxx
 	echo Compiling and linking $@...
 	$(CXX) -I.. $(CXXFLAGS) mandelbrot.cxx $(LINKFLTK) $(LDLIBS) -o $@
-pixmap_browser: pixmap_browser.cxx
+pixmap_browser$(EXEEXT): pixmap_browser.cxx
 	echo Compiling and linking $@...
 	$(CXX) -I.. $(CXXFLAGS) pixmap_browser.cxx -o $@ $(LINKFLTK) $(LDLIBS) $(IMAGELIBS)
 
 # OpenGL demos...
-CubeView: CubeMain.o CubeView.o CubeViewUI.o
+CubeView$(EXEEXT): CubeMain.o CubeView.o CubeViewUI.o
 	echo Compiling and linking $@...
 	$(CXX) $(CXXFLAGS) CubeMain.o CubeView.o CubeViewUI.o \
 		$(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) -o $@
 CubeMain.o: CubeViewUI.h CubeView.h
 CubeView.o: CubeView.h
 
-cube: cube.cxx
+cube$(EXEEXT): cube.cxx
 	echo Compiling and linking $@...
 	$(CXX) -I.. $(CXXFLAGS) cube.cxx $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) -o $@
-fractals: fractals.cxx
+fractals$(EXEEXT): fractals.cxx
 	echo Compiling and linking $@...
 	$(CXX) -I.. $(CXXFLAGS) fractals.cxx $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) -o $@
-fullscreen: fullscreen.cxx
+fullscreen$(EXEEXT): fullscreen.cxx
 	echo Compiling and linking $@...
 	$(CXX) -I.. $(CXXFLAGS) fullscreen.cxx $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) -o $@
-glpuzzle: glpuzzle.cxx
+glpuzzle$(EXEEXT): glpuzzle.cxx
 	echo Compiling and linking $@...
 	$(CXX) -I.. $(CXXFLAGS) glpuzzle.cxx $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) -o $@
-gl_overlay: gl_overlay.cxx
+gl_overlay$(EXEEXT): gl_overlay.cxx
 	echo Compiling and linking $@...
 	$(CXX) -I.. $(CXXFLAGS) gl_overlay.cxx $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) -o $@
-shiny: shiny.cxx shiny_panel.cxx
+shiny$(EXEEXT): shiny.cxx shiny_panel.cxx
 	echo Compiling and linking $@...
 	$(CXX) -I.. $(CXXFLAGS) shiny.cxx $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) -o $@
-shape: shape.cxx
+shape$(EXEEXT): shape.cxx
 	echo Compiling and linking $@...
 	$(CXX) -I.. $(CXXFLAGS) shape.cxx $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) -o $@
 
 # If you have libjpeg installed, you might want to try this test program:
 
-jpeg_image: jpeg_image.cxx
+jpeg_image$(EXEEXT): jpeg_image.cxx
 	echo Compiling and linking $@...
-	$(CXX) -I.. $(CXXFLAGS) -I../../../local/jpeg-6b -L../../../local/jpeg-6b jpeg_image.cxx $(LINKFLTK) $(LDLIBS) -ljpeg -lXext -o $@
+	$(CXX) -I.. $(CXXFLAGS) jpeg_image.cxx $(LINKFLTK) $(LDLIBS) -ljpeg -lXext -o $@
 
 depend:
 #	$(MAKEDEPEND) -I.. $(CXXFLAGS) $(CPPFILES) > makedepend
@@ -136,5 +186,5 @@ install:
 	@echo Nothing to install in test directory.
 
 #
-# End of "$Id: Makefile,v 1.19.2.7.2.7 2001/11/17 15:27:15 easysw Exp $".
+# End of "$Id: Makefile,v 1.19.2.7.2.8 2001/11/18 12:48:38 easysw Exp $".
 #
author	Michael R Sweet <michael.r.sweet@gmail.com>	2001-11-18 12:48:38 +0000
committer	Michael R Sweet <michael.r.sweet@gmail.com>	2001-11-18 12:48:38 +0000
commit	8b5a03d3a2a9927609d41127fd6d639fe961a46f (patch)
tree	02cd767ff039c36bdadb95ba3bfeacb4552d2669
parent	f21f8f8993e11d5561c434d118a7477363f4eb96 (diff)