Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-05-26 01:46:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updated README and distribution packages to use v1.0.1.

Browse Source 
Updated makefiles and makeincludes to use DSONAME and GLDLIBS.

Updated configure.in to use DSONAME instead of LIBNAME.

Updated editor example code in documentation.

Added ANSI C++ changes to make things compile with the latest EGCS
compiler.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.0@458 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet
1999-03-25 15:26:44 +00:00
parent 7b19ba41ae
commit a5778a1864
29 changed files with 186 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README
+2 -3
View File
@@ -1,6 +1,5 @@
README - Fast Light Tool Kit (FLTK) Version 1.0
-----------------------------------------------
README - Fast Light Tool Kit (FLTK) Version 1.0.1
-------------------------------------------------
WHAT IS FLTK?
configure.in
+13 -16
View File
@@ -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 1999/03/10 14:22:29 mike Exp $"
dnl# "$Id: configure.in,v 1.33.2.1 1999/03/25 15:26:28 mike Exp $"
dnl#
dnl# Configuration script for the Fast Light Tool Kit (FLTK).
dnl#
@@ -36,6 +36,7 @@ else
LIBCOMMAND="ar crs"
fi
DSOCOMMAND="echo"
DSONAME=""
dnl# Get the operating system and version number...
@@ -61,31 +62,26 @@ if eval "test x$enable_shared = xyes"; then
PICFLAG=1
case $uname in
SunOS* | UNIX_S*)
LIBNAME="libfltk.so.1"
DSOCOMMAND="\$(CXX) -Wl,-h,\$(LIBNAME) \$(LDLIBS) -G $DEBUGFLAG -o"
ln -s libfltk.so.1 lib/libfltk.so
DSONAME="libfltk.so.1"
DSOCOMMAND="\$(CXX) -Wl,-h,libfltk.so.1 \$(LDLIBS) -G $DEBUGFLAG -o"
;;
HP-UX*)
LIBNAME="libfltk.sl.1"
DSONAME="libfltk.sl.1"
DSOCOMMAND="ld -b -z +h libfltk.sl.1 $DEBUGFLAG -o"
ln -s libfltk.sl.1 lib/libfltk.sl
;;
OSF1*)
LIBNAME="libfltk.so.1"
DSOCOMMAND="\$(CXX) -Wl,-soname,\$(LIBNAME) \$(LDLIBS) -shared $DEBUGFLAG -o"
ln -s libfltk.so.1 lib/libfltk.so
DSONAME="libfltk.so.1"
DSOCOMMAND="\$(CXX) -Wl,-soname,libfltk.so.1 \$(LDLIBS) -shared $DEBUGFLAG -o"
;;
IRIX*)
LIBNAME="libfltk.so.1"
DSOCOMMAND="\$(CXX) -soname \$(LIBNAME) \$(LDLIBS) -shared $DEBUGFLAG -o"
ln -s libfltk.so.1 lib/libfltk.so
DSONAME="libfltk.so.1"
DSOCOMMAND="\$(CXX) -soname libfltk.so.1 \$(LDLIBS) -shared $DEBUGFLAG -o"
;;
*)
echo "Warning: shared libraries may not be supported. Trying -shared"
echo " option with compiler."
LIBNAME="libfltk.so.1"
DSOCOMMAND="\$(CXX) -Wl,-soname,\$(LIBNAME) \$(LDLIBS) -shared $DEBUGFLAG -o"
ln -s libfltk.so.1 lib/libfltk.so
DSONAME="libfltk.so.1"
DSOCOMMAND="\$(CXX) -Wl,-soname,libfltk.so.1 \$(LDLIBS) -shared $DEBUGFLAG -o"
;;
esac
fi])
@@ -227,6 +223,7 @@ fi
CFLAGS="$DEBUGFLAG $CFLAGS"
CXXFLAGS="$DEBUGFLAG $CXXFLAGS"
AC_SUBST(DSONAME)
AC_SUBST(DSOCOMMAND)
AC_SUBST(LIBNAME)
AC_SUBST(LIBCOMMAND)
@@ -235,5 +232,5 @@ AC_CONFIG_HEADER(config.h:configh.in)
AC_OUTPUT(makeinclude)
dnl#
dnl# End of "$Id: configure.in,v 1.33 1999/03/10 14:22:29 mike Exp $".
dnl# End of "$Id: configure.in,v 1.33.2.1 1999/03/25 15:26:28 mike Exp $".
dnl#
documentation/editor.html
+17 -17
View File
@@ -56,27 +56,27 @@ items in a menubar:
<UL>
<PRE>
Fl_Menu_Item menuitems[] = {
{ &quot;&amp;File&quot;, 0, 0, 0, FL_SUBMENU },
{ &quot;&amp;New&quot;, FL_ALT + 'n', new_cb },
{ &quot;&amp;Open...&quot;, FL_ALT + 'o', open_cb, 0, FL_MENU_DIVIDER },
{ &quot;&amp;Save&quot;, FL_ALT + 's', save_cb },
{ &quot;Save &amp;As...&quot;, FL_ALT + FL_SHIFT + 's', saveas_cb, 0, FL_MENU_DIVIDER },
{ &quot;&amp;Quit&quot;, FL_ALT + 'q', quit_cb },
{ "&amp;File", 0, 0, 0, FL_SUBMENU },
{ "&amp;New", FL_ALT + 'n', (Fl_Callback *)new_cb },
{ "&amp;Open...", FL_ALT + 'o', (Fl_Callback *)open_cb, 0, FL_MENU_DIVIDER },
{ "&amp;Save", FL_ALT + 's', (Fl_Callback *)save_cb },
{ "Save &amp;As...", FL_ALT + FL_SHIFT + 's', (Fl_Callback *)saveas_cb, 0, FL_MENU_DIVIDER },
{ "&amp;Quit", FL_ALT + 'q', (Fl_Callback *)quit_cb },
{ 0 },
{ &quot;&amp;Edit&quot;, 0, 0, 0, FL_SUBMENU },
{ &quot;&amp;Undo&quot;, FL_ALT + 'z', undo_cb, 0, FL_MENU_DIVIDER },
{ &quot;Cu&amp;t&quot;, FL_ALT + 'x', cut_cb },
{ &quot;&amp;Copy&quot;, FL_ALT + 'c', copy_cb },
{ &quot;&amp;Paste&quot;, FL_ALT + 'v', paste_cb },
{ &quot;&amp;Delete&quot;, 0, delete_cb },
{ "&amp;Edit", 0, 0, 0, FL_SUBMENU },
{ "&amp;Undo", FL_ALT + 'z', (Fl_Callback *)undo_cb, 0, FL_MENU_DIVIDER },
{ "Cu&amp;t", FL_ALT + 'x', (Fl_Callback *)cut_cb },
{ "&amp;Copy", FL_ALT + 'c', (Fl_Callback *)copy_cb },
{ "&amp;Paste", FL_ALT + 'v', (Fl_Callback *)paste_cb },
{ "&amp;Delete", 0, (Fl_Callback *)delete_cb },
{ 0 },
{ &quot;&amp;Search&quot;, 0, 0, 0, FL_SUBMENU },
{ &quot;&amp;Find...&quot;, FL_ALT + 'f', find_cb },
{ &quot;F&amp;ind Again&quot;, FL_ALT + 'g', find2_cb },
{ &quot;&amp;Replace...&quot;, FL_ALT + 'r', replace_cb },
{ &quot;Re&amp;place Again&quot;, FL_ALT + 't', replace2_cb },
{ "&amp;Search", 0, 0, 0, FL_SUBMENU },
{ "&amp;Find...", FL_ALT + 'f', (Fl_Callback *)find_cb },
{ "F&amp;ind Again", FL_ALT + 'g', (Fl_Callback *)find2_cb },
{ "&amp;Replace...", FL_ALT + 'r', (Fl_Callback *)replace_cb },
{ "Re&amp;place Again", FL_ALT + 't', (Fl_Callback *)replace2_cb },
{ 0 },
{ 0 }
documentation/index.html
+2 -2
View File
@@ -8,8 +8,8 @@
<TR>
<TD ALIGN=CENTER VALIGN=MIDDLE><IMG SRC=FL.gif ALIGN=ABSMIDDLE></TD>
<TD ALIGN=CENTER VALIGN=MIDDLE>
<H1>FLTK 1.0 Programming Manual</H1>
Revision 7 by Michael Sweet, Craig P. Earls, and Bill Spitzak<BR>
<H1>FLTK 1.0.1 Programming Manual</H1>
Revision 8 by Michael Sweet, Craig P. Earls, and Bill Spitzak<BR>
Copyright 1998-1999 by Bill Spitzak and others.<BR>
</TD>
</TR>
documentation/preface.html
+2 -2
View File
@@ -2,8 +2,8 @@
<HEAD>
<META CONTENT="Written by Michael Sweet, Craig P. Earls, and Bill Spitzak" NAME=Author>
<META CONTENT="Copyright 1998-1999 by Bill Spitzak and Others." NAME=Copyright>
<META CONTENT="Revision 7" NAME=DocNumber>
<TITLE>FLTK 1.0 Programming Manual</TITLE>
<META CONTENT="Revision 8" NAME=DocNumber>
<TITLE>FLTK 1.0.1 Programming Manual</TITLE>
</HEAD>
<BODY>
<H1 ALIGN=RIGHT><A NAME=preface>Preface</A></H1>
fluid/Makefile
+9 -8
View File
@@ -1,5 +1,5 @@
#
# "$Id: Makefile,v 1.10 1999/03/09 18:32:42 mike Exp $"
# "$Id: Makefile,v 1.10.2.1 1999/03/25 15:26:30 mike Exp $"
#
# Fluid makefile for the Fast Light Tool Kit (FLTK).
#
@@ -58,8 +58,8 @@ include ../makeinclude
.cxx :
$(CXX) -I.. $(CXXFLAGS) -o $@ $< -L../lib -lfltk $(LDLIBS)
$(PROGRAM) : $(OBJECTS) ../lib/libfltk.a
$(CXX) $(LDFLAGS) -o $(PROGRAM) $(OBJECTS) ../lib/libfltk.a $(LDLIBS)
$(PROGRAM) : $(OBJECTS) ../lib/$(LIBNAME)
$(CXX) $(LDFLAGS) -o $(PROGRAM) $(OBJECTS) -L../lib -lfltk $(LDLIBS)
clean :
-@ rm -f *.o $(PROGRAM) $(CLEAN) core *~ makedepend
@@ -70,10 +70,11 @@ depend:
include makedepend
install: $(PROGRAM)
strip $(PROGRAM)
-mkdir -p $(bindir)
cp $(PROGRAM) $(bindir)/$(PROGRAM)
@chmod a+rx,u+w,g-w,o-w $(bindir)/$(PROGRAM)
@echo "Installing FLUID..."
@strip $(PROGRAM)
@-mkdir -p $(bindir)
@cp $(PROGRAM) $(bindir)/$(PROGRAM)
@chmod 755 $(bindir)/$(PROGRAM)
uninstall:
-@ rm -f $(bindir)/$(PROGRAM)
@@ -90,5 +91,5 @@ rebuild:
./fluid -c widget_panel.fl
#
# End of "$Id: Makefile,v 1.10 1999/03/09 18:32:42 mike Exp $".
# End of "$Id: Makefile,v 1.10.2.1 1999/03/25 15:26:30 mike Exp $".
#
makefiles/makeinclude.cygnus
+6 -3
View File
@@ -1,5 +1,5 @@
#
# "$Id: makeinclude.cygnus,v 1.9 1999/02/22 21:16:21 mike Exp $"
# "$Id: makeinclude.cygnus,v 1.9.2.1 1999/03/25 15:26:31 mike Exp $"
#
# Make include file for the Fast Light Tool Kit (FLTK).
#
@@ -42,11 +42,14 @@ CXXFLAGS = -Wall -O2 -DWIN32 -mno-cygwin
LIBNAME = libfltk.a
LIBCOMMAND = ar -ruv
RANLIB = ranlib
DSONAME =
DSOCOMMAND = echo
# libraries to link with:
LDLIBS = -lgdi32 -luser32 -lglu32 -lopengl32 -lmsvcrt -lwsock32 -lm \
LDLIBS = -lgdi32 -luser32 -lmsvcrt -lwsock32 -lm -mno-cygwin -mwindows
GLDLIBS = -lgdi32 -luser32 -lglu32 -lopengl32 -lmsvcrt -lwsock32 -lm \
-mno-cygwin -mwindows
#
# End of "$Id: makeinclude.cygnus,v 1.9 1999/02/22 21:16:21 mike Exp $".
# End of "$Id: makeinclude.cygnus,v 1.9.2.1 1999/03/25 15:26:31 mike Exp $".
#
makefiles/makeinclude.mingw32
+6 -3
View File
@@ -1,5 +1,5 @@
#
# "$Id: makeinclude.mingw32,v 1.9 1999/02/18 14:28:18 mike Exp $"
# "$Id: makeinclude.mingw32,v 1.9.2.1 1999/03/25 15:26:31 mike Exp $"
#
# Make include file for the Fast Light Tool Kit (FLTK).
#
@@ -42,10 +42,13 @@ CXXFLAGS = -Wall -O2 -DWIN32 -mwindows
LIBNAME = libfltk.a
LIBCOMMAND = ar -ruv
RANLIB = ranlib
DSONAME =
DSOCOMMAND = echo
# libraries to link with:
LDLIBS = -lgdi32 -luser32 -lglu32 -lopengl32 -lmsvcrt -lwsock32 -lm
LDLIBS = -lgdi32 -luser32 -lmsvcrt -lwsock32 -lm
GLDLIBS = -lgdi32 -luser32 -lglu32 -lopengl32 -lmsvcrt -lwsock32 -lm
#
# End of "$Id: makeinclude.mingw32,v 1.9 1999/02/18 14:28:18 mike Exp $".
# End of "$Id: makeinclude.mingw32,v 1.9.2.1 1999/03/25 15:26:31 mike Exp $".
#
makeinclude.in
+5 -3
View File
@@ -1,5 +1,5 @@
#
# "$Id: makeinclude.in,v 1.7 1999/03/09 18:32:42 mike Exp $"
# "$Id: makeinclude.in,v 1.7.2.1 1999/03/25 15:26:28 mike Exp $"
#
# Make include file for the Fast Light Tool Kit (FLTK).
# @configure_input@
@@ -45,11 +45,13 @@ CXXFLAGS =@CXXFLAGS@ @X_CFLAGS@
LIBNAME =@LIBNAME@
LIBCOMMAND =@LIBCOMMAND@
RANLIB =@RANLIB@
DSONAME =@DSONAME@
DSOCOMMAND =@DSOCOMMAND@
# libraries to link with:
LDLIBS =@LDFLAGS@ @LIBS@ @GLLIB@ -lX11 -lXext @X_EXTRA_LIBS@ -lm
LDLIBS =@LDFLAGS@ @LIBS@ -lX11 -lXext @X_EXTRA_LIBS@ -lm
GLDLIBS =@LDFLAGS@ @LIBS@ @GLLIB@ -lX11 -lXext @X_EXTRA_LIBS@ -lm
#
# End of "$Id: makeinclude.in,v 1.7 1999/03/09 18:32:42 mike Exp $".
# End of "$Id: makeinclude.in,v 1.7.2.1 1999/03/25 15:26:28 mike Exp $".
#
packages/dunix/fltk.key
+4 -4
View File
@@ -1,9 +1,9 @@
NAME='Fast Light Tool Kit, 1.0'
NAME='Fast Light Tool Kit, 1.0.1'
CODE=FLT
VERS=100
MI=fltk.mi
COMPRESS=1
%%
FLTDSO100 . 2 'FLTK DSOs, 1.0'
FLTDEV100 . 2 'FLTK Development Software, 1.0'
FLTDOC100 . 2 'FLTK Documentation, 1.0'
FLTDSO100 . 2 'FLTK DSOs, 1.0.1'
FLTDEV100 . 2 'FLTK Development Software, 1.0.1'
FLTDOC100 . 2 'FLTK Documentation, 1.0.1'
packages/dunix/makedist.sh
+8 -8
View File
@@ -3,8 +3,8 @@
# makedist - make a digital unix distribution.
#
rm -rf fltk-1.0-dunix
mkdir fltk-1.0-dunix
rm -rf fltk-1.0.1-dunix
mkdir fltk-1.0.1-dunix
echo "Building distribution tree..."
rm -rf usr
@@ -23,7 +23,7 @@ cp ../../fluid/fluid usr/bin/X11
strip usr/bin/X11/fluid
cp ../../lib/libfltk.a usr/lib
cp ../../lib/libfltk.so.1 usr/lib
cp ../../src/libfltk.so.1 usr/lib
ln -sf libfltk.so.1 usr/lib/libfltk.so
cp ../../documentation/*.html usr/info/fltk
@@ -40,16 +40,16 @@ for file in *.H; do
done
cd ../../..
kits fltk.key . fltk-1.0-dunix
kits fltk.key . fltk-1.0.1-dunix
echo "Archiving distribution..."
tar cf fltk-1.0-dunix.tar fltk-1.0-dunix
tar cf fltk-1.0.1-dunix.tar fltk-1.0.1-dunix
echo "Compressing distribution..."
rm -f fltk-1.0-dunix.tar.gz
gzip -9 fltk-1.0-dunix.tar
rm -f fltk-1.0.1-dunix.tar.gz
gzip -9 fltk-1.0.1-dunix.tar
echo "Removing temporary distribution files..."
rm -rf fltk-1.0-dunix
rm -rf fltk-1.0.1-dunix
rm -rf usr
packages/hpux/fltk.info
+7 -7
View File
@@ -1,7 +1,7 @@
product
tag fltk
revision 1.0
title Fast Light Tool Kit, 1.0
revision 1.0.1
title Fast Light Tool Kit, 1.0.1
description C++ GUI toolkit for UNIX and Microsoft Windows.
copyright Copyright 1998-1999, see the GNU Library General Public License for details.
number HP-FLTK
@@ -13,15 +13,15 @@ product
fileset
tag dso
title FLTK - Shared Libraries, 1.0
title FLTK - Shared Libraries, 1.0.1
file -m 0000 -o root -g sys lib/libfltk.sl /usr/lib/libfltk.sl
file -m 0555 -o root -g sys lib/libfltk.sl.1 /usr/lib/libfltk.sl.1
file -m 0000 -o root -g sys packages/hpux/links/libfltk.sl /usr/lib/libfltk.sl
file -m 0555 -o root -g sys src/libfltk.sl.1 /usr/lib/libfltk.sl.1
end
fileset
tag doc
title FLTK - Documentation, 1.0
title FLTK - Documentation, 1.0.1
file -m 0444 -o root -g sys documentation/adjuster1.gif /usr/info/fltk/adjuster1.gif
file -m 0444 -o root -g sys documentation/ask.C.gif /usr/info/fltk/ask.C.gif
@@ -158,7 +158,7 @@ product
fileset
tag dev
title FLTK - Development Software, 1.0
title FLTK - Development Software, 1.0.1
file -m 0444 -o root -g sys fluid/fluid /usr/bin/X11/fluid
file -m 0444 -o root -g sys FL/dirent.h /usr/include/FL/dirent.h
packages/hpux/makedist.sh
+4 -3
View File
@@ -21,11 +21,12 @@ for file in `cd ../../FL; ls *.H`; do
done
ln -sf FL links/Fl
ln -sf libfltk.sl.1 links/libfltk.sl
cd ../..
/usr/sbin/swpackage -v -s packages/hpux/fltk.info \
-d packages/hpux/fltk-1.0-hpux.depot -x write_remote_files=true \
-d packages/hpux/fltk-1.0.1-hpux.depot -x write_remote_files=true \
-x target_type=tape fltk
echo "Compressing distribution..."
@@ -33,6 +34,6 @@ echo "Compressing distribution..."
cd packages/hpux
rm -rf links
rm -f fltk-1.0-hpux.depot.gz
gzip -9 fltk-1.0-hpux.depot
rm -f fltk-1.0.1-hpux.depot.gz
gzip -9 fltk-1.0.1-hpux.depot
packages/irix/fltk.list
+1 -1
View File
@@ -320,4 +320,4 @@ f 0444 root sys usr/info/fltk/value_slider.gif documentation/value_slider.gif fl
f 0444 root sys usr/info/fltk/widgets.html documentation/widgets.html fltk.man.dev
f 0555 root sys usr/lib32/libfltk.a lib/libfltk.a fltk.sw.dev
l 0000 root sys usr/lib32/libfltk.so - fltk.sw.eoe symval("libfltk.so.1")
f 0555 root sys usr/lib32/libfltk.so.1 lib/libfltk.so.1 fltk.sw.eoe
f 0555 root sys usr/lib32/libfltk.so.1 src/libfltk.so.1 fltk.sw.eoe
packages/irix/fltk.spec
+8 -8
View File
@@ -1,17 +1,17 @@
product fltk
id "Fast Light Tool Kit, 1.0"
id "Fast Light Tool Kit, 1.0.1"
image sw
id "FLTK Execution Environment, 1.0"
version 010000000
id "FLTK Execution Environment, 1.0.1"
version 010001000
subsys eoe default
id "FLTK - Execution-Only Environment, 1.0"
id "FLTK - Execution-Only Environment, 1.0.1"
exp fltk.sw.eoe
endsubsys
subsys dev default
id "FLTK - Development Environment, 1.0"
id "FLTK - Development Environment, 1.0.1"
exp fltk.sw.dev
prereq
(
@@ -21,11 +21,11 @@ product fltk
endimage
image man
id "FLTK Documentation, 1.0"
version 010000000
id "FLTK Documentation, 1.0.1"
version 010001000
subsys eoe default
id "FLTK - Development Manuals, 1.0"
id "FLTK - Development Manuals, 1.0.1"
exp fltk.man.dev
endsubsys
endimage
packages/irix/fltk5x.list
+1 -1
View File
@@ -320,4 +320,4 @@ f 0444 root sys usr/info/fltk/value_slider.gif documentation/value_slider.gif fl
f 0444 root sys usr/info/fltk/widgets.html documentation/widgets.html fltk.man.dev
f 0555 root sys usr/lib/libfltk.a lib/libfltk.a fltk.sw.dev
l 0000 root sys usr/lib/libfltk.so - fltk.sw.eoe symval("libfltk.so.1")
f 0555 root sys usr/lib/libfltk.so.1 lib/libfltk.so.1 fltk.sw.eoe
f 0555 root sys usr/lib/libfltk.so.1 src/libfltk.so.1 fltk.sw.eoe
packages/irix/makedist.sh
+1 -1
View File
@@ -12,5 +12,5 @@ case `uname -r` in
;;
esac
tar cvf fltk-1.0-irix-`uname -r`.tardist fltk fltk.idb fltk.man fltk.sw
tar cvf fltk-1.0.1-irix-`uname -r`.tardist fltk fltk.idb fltk.man fltk.sw
packages/linux/fltk.spec
+3 -3
View File
@@ -1,10 +1,10 @@
Summary: Fast Light Tool Kit
Name: fltk
Version: 1.0
Version: 1.0.1
Release: 1
Copyright: LGPL
Group: Development/GUI
Source: ftp://ftp.fltk.org/pub/fltk/1.0/fltk-1.0-source.tar.gz
Group: Development/Libraries
Source: ftp://ftp.fltk.org/pub/fltk/1.0.1/fltk-1.0.1-source.tar.gz
URL: http://www.fltk.org
Packager: Michael Sweet <mike@easysw.com>
%description
packages/linux/makedist.sh
+23 -5
View File
@@ -3,15 +3,33 @@
# makedist - make a linux distribution.
#
# Note: YOU MUST "MAKE INSTALL" FLTK PRIOR TO RUNNING THIS SCRIPT.
#
# This is because the developers of the RPM distribution
# format can't seem to realize that it would be nice to
# make a distribution *without* first installing it, which
# basically means you need to have two disks or systems in
# order to test your distribution. Ya, I think RPM is just
# *great*...
# tools don't have an easy way to install a set of files
# to any location you want, e.g.:
#
# destination-file = source-file
#
# If you look at the other (commercial) UNIX distributions
# you'll notice that ALL of them support this syntax in one
# form or another.
#
# Several folks have pointed out the "build root" stuff
# provided by RPM. There are two problems with this:
#
# 1. You still need to install the files somewhere prior
# to making the installation.
# 2. Users can then install the software at a different
# location, which will cause a lot of problems with
# the FLTK DSOs.
#
# Also, this script currently only builds a binary distribution.
# FLTK's source tar file builds under Linux without any modification.
#
# Finally, if you ask me the RPM install process is simple and
# slick. You can rebuild software from source automatically, etc.
# If it weren't for the fact that the RPM build process is so
# bass ackwards I'd love it completely.
#
rpm -bb fltk.spec
packages/solaris-intel/fltk.pkginfo
+3 -3
View File
@@ -1,11 +1,11 @@
PKG=fltk
NAME=Fast Light Tool Kit, 1.0
NAME=Fast Light Tool Kit, 1.0.1
ARCH=i86pc
VERSION=1.0
VERSION=1.0.1
CATEGORY=development
DESC=C++ GUI Toolkit for UNIX and Windows.
VENDOR=GNU
HOTLINE=http://www.fltk.org
EMAIL=fltk-bugs@fltk.org
CLASSES=dev doc dso
PSTAMP=fltk19990310000
PSTAMP=fltk19990325000
packages/solaris-intel/fltk.prototype
+1 -1
View File
@@ -237,7 +237,7 @@ f dev info/fltk/widgets.html=documentation/widgets.html 0444 root sys
d eoe lib 0555 root sys
d dev lib 0555 root sys
f dev lib/libfltk.a=lib/libfltk.a 0555 root sys
f eoe lib/libfltk.so.1=lib/libfltk.so.1 0555 root sys
f eoe lib/libfltk.so.1=src/libfltk.so.1 0555 root sys
s dev include/FL/Enumerations.h=Enumerations.H
s dev include/FL/Fl.h=Fl.H
s dev include/FL/Fl_Adjuster.h=Fl_Adjuster.H
packages/solaris-intel/makedist.sh
+3 -3
View File
@@ -22,10 +22,10 @@ cd packages/solaris-intel
echo "Packing distribution..."
pkgtrans -s . fltk-1.0-solaris-intel.pkg fltk
pkgtrans -s . fltk-1.0.1-solaris-intel.pkg fltk
rm -rf fltk
echo "Compressing distribution..."
rm -f fltk-1.0-solaris-intel.pkg.gz
gzip -9 fltk-1.0-solaris-intel.pkg
rm -f fltk-1.0.1-solaris-intel.pkg.gz
gzip -9 fltk-1.0.1-solaris-intel.pkg
packages/solaris-sparc/fltk.pkginfo
+3 -3
View File
@@ -1,11 +1,11 @@
PKG=fltk
NAME=Fast Light Tool Kit, 1.0
NAME=Fast Light Tool Kit, 1.0.1
ARCH=sun4m
VERSION=1.0
VERSION=1.0.1
CATEGORY=development
DESC=C++ GUI Toolkit for UNIX and Windows.
VENDOR=GNU
HOTLINE=http://www.fltk.org
EMAIL=fltk-bugs@fltk.org
CLASSES=dev doc dso
PSTAMP=fltk19990310000
PSTAMP=fltk19990325000
packages/solaris-sparc/fltk.prototype
+1 -1
View File
@@ -237,7 +237,7 @@ f dev info/fltk/widgets.html=documentation/widgets.html 0444 root sys
d eoe lib 0555 root sys
d dev lib 0555 root sys
f dev lib/libfltk.a=lib/libfltk.a 0555 root sys
f eoe lib/libfltk.so.1=lib/libfltk.so.1 0555 root sys
f eoe lib/libfltk.so.1=src/libfltk.so.1 0555 root sys
s dev include/FL/Enumerations.h=Enumerations.H
s dev include/FL/Fl.h=Fl.H
s dev include/FL/Fl_Adjuster.h=Fl_Adjuster.H
packages/solaris-sparc/makedist.sh
+3 -3
View File
@@ -22,10 +22,10 @@ cd packages/solaris-sparc
echo "Packing distribution..."
pkgtrans -s . fltk-1.0-solaris-sparc.pkg fltk
pkgtrans -s . fltk-1.0.1-solaris-sparc.pkg fltk
rm -rf fltk
echo "Compressing distribution..."
rm -f fltk-1.0-solaris-sparc.pkg.gz
gzip -9 fltk-1.0-solaris-sparc.pkg
rm -f fltk-1.0.1-solaris-sparc.pkg.gz
gzip -9 fltk-1.0.1-solaris-sparc.pkg
src/Fl_Clock.cxx
+3 -3
View File
@@ -1,5 +1,5 @@
//
// "$Id: Fl_Clock.cxx,v 1.8 1999/02/01 20:27:16 mike Exp $"
// "$Id: Fl_Clock.cxx,v 1.8.2.1 1999/03/25 15:26:42 mike Exp $"
//
// Clock widget for the Fast Light Tool Kit (FLTK).
//
@@ -145,7 +145,7 @@ static void tick(void *v) {
Fl::add_timeout(1.0, tick, v);
#else
struct timeval t;
gettimeofday(&t, NULL);
gettimeofday(&t, 0);
((Fl_Clock*)v)->value(t.tv_sec);
double delay = 1.0-t.tv_usec*.000001;
if (delay < .1 || delay > .9) delay = 1.0;
@@ -170,5 +170,5 @@ Fl_Clock::~Fl_Clock() {
}
//
// End of "$Id: Fl_Clock.cxx,v 1.8 1999/02/01 20:27:16 mike Exp $".
// End of "$Id: Fl_Clock.cxx,v 1.8.2.1 1999/03/25 15:26:42 mike Exp $".
//
src/Makefile
+27 -21
View File
@@ -1,5 +1,5 @@
#
# "$Id: Makefile,v 1.18 1999/03/09 18:33:46 mike Exp $"
# "$Id: Makefile,v 1.18.2.1 1999/03/25 15:26:43 mike Exp $"
#
# Library makefile for the Fast Light Tool Kit (FLTK).
#
@@ -150,16 +150,16 @@ LIBRARY = ../lib/$(LIBNAME)
OBJECTS = $(CPPFILES:.cxx=.o) $(CFILES:.c=.o)
all: $(LIBRARY) ../lib/libfltk.a
all: $(LIBRARY) $(DSONAME)
../lib/libfltk.a: $(OBJECTS)
@echo $(LIBCOMMAND) ../lib/libfltk.a ...
@$(LIBCOMMAND) ../lib/libfltk.a $(OBJECTS)
@$(RANLIB) ../lib/libfltk.a
../lib/libfltk.sl.1 ../lib/libfltk.so.1: $(OBJECTS)
@echo $(DSOCOMMAND) $(LIBRARY) ...
@$(DSOCOMMAND) $(LIBRARY) $(OBJECTS)
libfltk.sl.1 libfltk.so.1: $(OBJECTS)
@echo $(DSOCOMMAND) $(DSONAME) ...
@$(DSOCOMMAND) $(DSONAME) $(OBJECTS)
.SUFFIXES: .cxx .h .o
@@ -178,29 +178,35 @@ include makedepend
################################################################
install: ../lib/$(LIBNAME)
-mkdir -p $(libdir)
-cp ../lib/$(LIBNAME)* $(libdir)
-cp ../lib/libfltk.a $(libdir)
if test $(LIBNAME) = libfltk.so.1; then\
rm -f $(libdir)/libfltk.so;\
install: ../lib/$(LIBNAME) $(DSONAME)
@echo "Installing libraries..."
@-mkdir -p $(libdir)
@rm -f $(libdir)/$(LIBNAME)
@-cp ../lib/$(LIBNAME) $(libdir)
@-chmod 644 $(libdir)/$(LIBNAME)
@if test "$(DSONAME)" = libfltk.so.1; then\
rm -f $(libdir)/libfltk.so*;\
cp libfltk.so $(libdir)/libfltk.so.1; \
chmod 755 $(libdir)/libfltk.so.1; \
ln -s $(libdir)/libfltk.so.1 $(libdir)/libfltk.so;\
fi
if test $(LIBNAME) = libfltk.sl.1; then\
rm -f $(libdir)/libfltk.sl;\
@if test "$(DSONAME)" = libfltk.sl.1; then\
rm -f $(libdir)/libfltk.sl*;\
cp libfltk.sl $(libdir)/libfltk.sl.1; \
chmod 755 $(libdir)/libfltk.sl.1; \
ln -s $(libdir)/libfltk.sl.1 $(libdir)/libfltk.sl;\
fi
@-chmod a+r,u+w,g-w,o-w $(libdir)/$(LIBNAME)*
-mkdir -p $(includedir)
-rm -rf $(includedir)/FL $(includedir)/Fl
-cp -r ../FL $(includedir)
@-chmod -R a+r,u+w,g-w,o-w $(includedir)/FL
for file in $(includedir)/FL/*.H; do\
@echo "Installing include files..."
@-mkdir -p $(includedir)
@rm -rf $(includedir)/FL $(includedir)/Fl
@-cp -r ../FL $(includedir)
@-chmod -R 644 $(includedir)/FL
@for file in $(includedir)/FL/*.H; do\
newfile="`basename $$file H`h";\
ln -s $$file $(includedir)/FL/$$newfile;\
done
-ln -s FL $(includedir)/Fl
@-ln -s FL $(includedir)/Fl
#
# End of "$Id: Makefile,v 1.18 1999/03/09 18:33:46 mike Exp $".
# End of "$Id: Makefile,v 1.18.2.1 1999/03/25 15:26:43 mike Exp $".
#
test/Makefile
+16 -4
View File
@@ -1,5 +1,5 @@
#
# "$Id: Makefile,v 1.19 1999/02/22 21:52:17 mike Exp $"
# "$Id: Makefile,v 1.19.2.1 1999/03/25 15:26:43 mike Exp $"
#
# Test/example program makefile for the Fast Light Tool Kit (FLTK).
#
@@ -68,16 +68,28 @@ $(ALL): ../lib/$(LIBNAME)
# Other programs needing special "help"...
CubeView: CubeMain.o CubeView.o CubeViewUI.o
$(CXX) -I.. $(CXXFLAGS) CubeMain.o CubeView.o CubeViewUI.o \
-L../lib -lfltk $(LDLIBS) -o $@
-L../lib -lfltk $(GLDLIBS) -o $@
CubeMain.o: CubeViewUI.h CubeView.h
CubeView.o: CubeView.h
cube: cube.cxx
$(CXX) -I.. $(CXXFLAGS) cube.cxx -L../lib -lfltk $(GLDLIBS) -o $@
fractals: fractals.cxx
$(CXX) -I.. $(CXXFLAGS) fractals.cxx -L../lib -lfltk $(GLDLIBS) -o $@
fullscreen: fullscreen.cxx
$(CXX) -I.. $(CXXFLAGS) fullscreen.cxx -L../lib -lfltk $(GLDLIBS) -o $@
glpuzzle: glpuzzle.cxx
$(CXX) -I.. $(CXXFLAGS) glpuzzle.cxx -L../lib -lfltk $(GLDLIBS) -o $@
gl_overlay: gl_overlay.cxx
$(CXX) -I.. $(CXXFLAGS) gl_overlay.cxx -L../lib -lfltk $(GLDLIBS) -o $@
shiny: shiny.cxx shiny_panel.cxx
$(CXX) -I.. $(CXXFLAGS) shiny.cxx -L../lib -lfltk $(LDLIBS) -o $@
$(CXX) -I.. $(CXXFLAGS) shiny.cxx -L../lib -lfltk $(GLDLIBS) -o $@
keyboard: keyboard.cxx keyboard_ui.cxx
$(CXX) -I.. $(CXXFLAGS) keyboard.cxx -L../lib -lfltk $(LDLIBS) -o $@
mandelbrot: mandelbrot.cxx mandelbrot_ui.cxx
$(CXX) -I.. $(CXXFLAGS) mandelbrot.cxx -L../lib -lfltk $(LDLIBS) -o $@
shape: shape.cxx
$(CXX) -I.. $(CXXFLAGS) shape.cxx -L../lib -lfltk $(GLDLIBS) -o $@
# If you have libjpeg installed, you might want to try this test program:
@@ -94,5 +106,5 @@ install:
@echo Nothing to install in test directory.
#
# End of "$Id: Makefile,v 1.19 1999/02/22 21:52:17 mike Exp $".
# End of "$Id: Makefile,v 1.19.2.1 1999/03/25 15:26:43 mike Exp $".
#
test/checkers.cxx
+4 -4
View File
@@ -1,5 +1,5 @@
//
// "$Id: checkers.cxx,v 1.9 1999/01/07 19:17:50 mike Exp $"
// "$Id: checkers.cxx,v 1.9.2.1 1999/03/25 15:26:44 mike Exp $"
//
// Checkers game for the Fast Light Tool Kit (FLTK).
//
@@ -1299,7 +1299,7 @@ Fl_Menu_Item menu[] = {
{"Intelligence...", 'i', intel_cb, 0, FL_MENU_DIVIDER},
{"Copyright", 'c', copyright_cb},
{"Quit", 'q', quit_cb},
{0}};
{(const char *)0}};
Fl_Menu_Item busymenu[] = {
{"Stop", '.', stop_cb},
@@ -1309,7 +1309,7 @@ Fl_Menu_Item busymenu[] = {
{"Intelligence...", 'i', intel_cb},
{"Copyright", 'c', copyright_cb},
{"Quit", 'q', quit_cb},
{0}};
{(const char *)0}};
#endif
@@ -1366,5 +1366,5 @@ int main(int argc, char **argv) {
}
//
// End of "$Id: checkers.cxx,v 1.9 1999/01/07 19:17:50 mike Exp $".
// End of "$Id: checkers.cxx,v 1.9.2.1 1999/03/25 15:26:44 mike Exp $".
//