Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-06-04 23:42:15 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Move forms code to fltk_forms library, a la 2.0.

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2027 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet
2002-03-25 21:39:01 +00:00
parent 6c796f88c7
commit 5c360947ee
9 changed files with 158 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGES
+2
View File
@@ -1,6 +1,8 @@
CHANGES IN FLTK 1.1.0b12 CHANGES IN FLTK 1.1.0b12
- Documentation updates. - Documentation updates.
- The forms compatibility functions are now placed in a
"fltk_forms" library to match FLTK 2.0.
- Renamed down() and frame() to fl_down() and - Renamed down() and frame() to fl_down() and
fl_frame(), filename_xyz() to fl_filename_xyz(), and fl_frame(), filename_xyz() to fl_filename_xyz(), and
all of the define_FL_FOO() functions for the custom all of the define_FL_FOO() functions for the custom
configure.in
+14 -3
View File
@@ -1,7 +1,7 @@
dnl -*- sh -*- dnl -*- sh -*-
dnl the "configure" script is made from this by running GNU "autoconf" dnl the "configure" script is made from this by running GNU "autoconf"
dnl dnl
dnl "$Id: configure.in,v 1.33.2.31.2.54 2002/03/08 01:18:09 easysw Exp $" dnl "$Id: configure.in,v 1.33.2.31.2.55 2002/03/25 21:39:01 easysw Exp $"
dnl dnl
dnl Configuration script for the Fast Light Tool Kit (FLTK). dnl Configuration script for the Fast Light Tool Kit (FLTK).
dnl dnl
@@ -35,7 +35,7 @@ dnl FLTK library versions...
FL_MAJOR_VERSION=1 FL_MAJOR_VERSION=1
FL_MINOR_VERSION=1 FL_MINOR_VERSION=1
FL_PATCH_VERSION=0 FL_PATCH_VERSION=0
FL_RELEASE_VERSION=b11 FL_RELEASE_VERSION=b12
FL_API_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION} FL_API_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION}
AC_SUBST(FL_MAJOR_VERSION) AC_SUBST(FL_MAJOR_VERSION)
@@ -77,8 +77,10 @@ LINKFLTKGL="-lfltk_gl"
GLDEMOS="gldemos" GLDEMOS="gldemos"
LIBNAME="../lib/libfltk.a" LIBNAME="../lib/libfltk.a"
FLLIBNAME="../lib/libfltk_forms.a"
GLLIBNAME="../lib/libfltk_gl.a" GLLIBNAME="../lib/libfltk_gl.a"
AC_SUBST(FLLIBNAME)
AC_SUBST(GLDEMOS) AC_SUBST(GLDEMOS)
AC_SUBST(GLLIBNAME) AC_SUBST(GLLIBNAME)
AC_SUBST(LIBNAME) AC_SUBST(LIBNAME)
@@ -101,6 +103,7 @@ if test x$enable_shared = xyes; then
case $uname in case $uname in
*BSD* | Darwin*) *BSD* | Darwin*)
DSONAME="libfltk.$FL_API_VERSION.dylib" DSONAME="libfltk.$FL_API_VERSION.dylib"
FLDSONAME="libfltk_forms.$FL_API_VERSION.dylib"
GLDSONAME="libfltk_gl.$FL_API_VERSION.dylib" GLDSONAME="libfltk_gl.$FL_API_VERSION.dylib"
DSOCOMMAND="ld $DSOFLAGS -dylib /usr/lib/dylib1.o -lc" DSOCOMMAND="ld $DSOFLAGS -dylib /usr/lib/dylib1.o -lc"
if test "$libdir" != "/usr/lib"; then if test "$libdir" != "/usr/lib"; then
@@ -110,6 +113,7 @@ if test x$enable_shared = xyes; then
SunOS* | UNIX_S*) SunOS* | UNIX_S*)
DSONAME="libfltk.so.$FL_API_VERSION" DSONAME="libfltk.so.$FL_API_VERSION"
FLDSONAME="libfltk_forms.so.$FL_API_VERSION"
GLDSONAME="libfltk_gl.so.$FL_API_VERSION" GLDSONAME="libfltk_gl.so.$FL_API_VERSION"
DSOCOMMAND="\$(CXX) -h \$@ \$(LDLIBS) -G $DEBUGFLAG -o" DSOCOMMAND="\$(CXX) -h \$@ \$(LDLIBS) -G $DEBUGFLAG -o"
if test "$libdir" != "/usr/lib"; then if test "$libdir" != "/usr/lib"; then
@@ -118,6 +122,7 @@ if test x$enable_shared = xyes; then
;; ;;
HP-UX*) HP-UX*)
DSONAME="libfltk.sl.$FL_API_VERSION" DSONAME="libfltk.sl.$FL_API_VERSION"
FLDSONAME="libfltk_forms.sl.$FL_API_VERSION"
GLDSONAME="libfltk_gl.sl.$FL_API_VERSION" GLDSONAME="libfltk_gl.sl.$FL_API_VERSION"
DSOCOMMAND="ld -b -z +h \$@ $DEBUGFLAG -o" DSOCOMMAND="ld -b -z +h \$@ $DEBUGFLAG -o"
if test "$libdir" != "/usr/lib"; then if test "$libdir" != "/usr/lib"; then
@@ -126,6 +131,7 @@ if test x$enable_shared = xyes; then
;; ;;
IRIX* | OSF1*) IRIX* | OSF1*)
DSONAME="libfltk.so.$FL_API_VERSION" DSONAME="libfltk.so.$FL_API_VERSION"
FLDSONAME="libfltk_forms.so.$FL_API_VERSION"
GLDSONAME="libfltk_gl.so.$FL_API_VERSION" GLDSONAME="libfltk_gl.so.$FL_API_VERSION"
DSOCOMMAND="\$(CXX) -Wl,-soname,\$@ \$(LDLIBS) -shared $DEBUGFLAG -o" DSOCOMMAND="\$(CXX) -Wl,-soname,\$@ \$(LDLIBS) -shared $DEBUGFLAG -o"
if test "$libdir" != "/usr/lib" - a "$libdir" != "/usr/lib32"; then if test "$libdir" != "/usr/lib" - a "$libdir" != "/usr/lib32"; then
@@ -134,6 +140,7 @@ if test x$enable_shared = xyes; then
;; ;;
Linux*) Linux*)
DSONAME="libfltk.so.$FL_API_VERSION" DSONAME="libfltk.so.$FL_API_VERSION"
FLDSONAME="libfltk_forms.so.$FL_API_VERSION"
GLDSONAME="libfltk_gl.so.$FL_API_VERSION" GLDSONAME="libfltk_gl.so.$FL_API_VERSION"
DSOCOMMAND="\$(CXX) -Wl,-soname,\$@ \$(LDLIBS) -shared -fPIC $DEBUGFLAG -o" DSOCOMMAND="\$(CXX) -Wl,-soname,\$@ \$(LDLIBS) -shared -fPIC $DEBUGFLAG -o"
if test "$libdir" != "/usr/lib"; then if test "$libdir" != "/usr/lib"; then
@@ -142,6 +149,7 @@ if test x$enable_shared = xyes; then
;; ;;
AIX*) AIX*)
DSONAME="libfltk_s.a" DSONAME="libfltk_s.a"
FLDSONAME="libfltk_forms_s.a"
GLDSONAME="libfltk_gl_s.a" GLDSONAME="libfltk_gl_s.a"
DSOCOMMAND="\$(CXX) -Wl,-bexpall,-bM:SRE,-bnoentry -o" DSOCOMMAND="\$(CXX) -Wl,-bexpall,-bM:SRE,-bnoentry -o"
;; ;;
@@ -151,6 +159,7 @@ if test x$enable_shared = xyes; then
*) *)
AC_MSG_WARN(Shared libraries may not be supported. Trying -shared option with compiler.) AC_MSG_WARN(Shared libraries may not be supported. Trying -shared option with compiler.)
DSONAME="libfltk.so.$FL_API_VERSION" DSONAME="libfltk.so.$FL_API_VERSION"
FLDSONAME="libfltk_forms.so.$FL_API_VERSION"
GLDSONAME="libfltk_gl.so.$FL_API_VERSION" GLDSONAME="libfltk_gl.so.$FL_API_VERSION"
DSOCOMMAND="\$(CXX) -Wl,-soname,\$@ \$(LDLIBS) -shared $DEBUGFLAG -o" DSOCOMMAND="\$(CXX) -Wl,-soname,\$@ \$(LDLIBS) -shared $DEBUGFLAG -o"
;; ;;
@@ -159,6 +168,7 @@ else
DSOCOMMAND="echo" DSOCOMMAND="echo"
DSOLINK="" DSOLINK=""
DSONAME="" DSONAME=""
FLDSONAME=""
GLDSONAME="" GLDSONAME=""
PICFLAG=0 PICFLAG=0
fi fi
@@ -166,6 +176,7 @@ fi
AC_SUBST(DSOCOMMAND) AC_SUBST(DSOCOMMAND)
AC_SUBST(DSOLINK) AC_SUBST(DSOLINK)
AC_SUBST(DSONAME) AC_SUBST(DSONAME)
AC_SUBST(FLDSONAME)
AC_SUBST(GLDSONAME) AC_SUBST(GLDSONAME)
AC_ARG_ENABLE(threads, [ --enable-threads enable multi-threading support]) AC_ARG_ENABLE(threads, [ --enable-threads enable multi-threading support])
@@ -693,5 +704,5 @@ dnl Make sure the fltk-config script is executable...
chmod +x fltk-config chmod +x fltk-config
dnl dnl
dnl End of "$Id: configure.in,v 1.33.2.31.2.54 2002/03/08 01:18:09 easysw Exp $". dnl End of "$Id: configure.in,v 1.33.2.31.2.55 2002/03/25 21:39:01 easysw Exp $".
dnl dnl
fltk-config.in
+12 -3
View File
@@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# #
# "$Id: fltk-config.in,v 1.12.2.8 2002/02/20 13:02:25 easysw Exp $" # "$Id: fltk-config.in,v 1.12.2.9 2002/03/25 21:39:01 easysw Exp $"
# #
# FLTK configuration utility. # FLTK configuration utility.
# #
@@ -74,6 +74,7 @@ Options telling what we are doing:
[--use-gl] use GL [--use-gl] use GL
[--use-images] use extra image formats (PNG, JPEG) [--use-images] use extra image formats (PNG, JPEG)
[--use-glut] use glut compatibility layer [--use-glut] use glut compatibility layer
[--use-forms] use forms compatibility layer
Options telling what information we request: Options telling what information we request:
[--cflags] return flags to compile C using FLTK [--cflags] return flags to compile C using FLTK
@@ -131,6 +132,9 @@ do
--use-gl | --use-glut) --use-gl | --use-glut)
use_gl=yes use_gl=yes
;; ;;
--use-forms)
use_forms=yes
;;
--use-images) --use-images)
use_images=yes use_images=yes
;; ;;
@@ -182,12 +186,17 @@ LDSTATIC="$libdir/libfltk.a $LDLIBS"
LDLIBS="$libs -lfltk $LDLIBS" LDLIBS="$libs -lfltk $LDLIBS"
LIBS="$LIBS $libdir/libfltk.a" LIBS="$LIBS $libdir/libfltk.a"
if test "$use_gl" = "yes"; then if test x$use_forms = xyes; then
LDLIBS="-lfltk_forms $LDLIBS"
LDSTATIC="$libdir/libfltk_forms.a $LDSTATIC"
LIBS="$LIBS $libdir/libfltk_forms.a"
fi
if test x$use_gl = xyes; then
LDLIBS="-lfltk_gl @GLLIB@ $LDLIBS" LDLIBS="-lfltk_gl @GLLIB@ $LDLIBS"
LDSTATIC="$libdir/libfltk_gl.a @GLLIB@ $LDSTATIC" LDSTATIC="$libdir/libfltk_gl.a @GLLIB@ $LDSTATIC"
LIBS="$LIBS $libdir/libfltk_gl.a" LIBS="$LIBS $libdir/libfltk_gl.a"
fi fi
if test "$use_images" = "yes"; then if test x$use_images = xyes; then
LDLIBS="$LDLIBS $IMAGELIBS" LDLIBS="$LDLIBS $IMAGELIBS"
LDSTATIC="$LDSTATIC $IMAGELIBS" LDSTATIC="$LDSTATIC $IMAGELIBS"
fi fi
fltk.list.in
+17 -2
View File
@@ -1,5 +1,5 @@
# #
# "$Id: fltk.list.in,v 1.1.2.4 2002/01/07 18:47:27 easysw Exp $" # "$Id: fltk.list.in,v 1.1.2.5 2002/03/25 21:39:01 easysw Exp $"
# #
# EPM product list file for the Fast Light Tool Kit (FLTK). # EPM product list file for the Fast Light Tool Kit (FLTK).
# #
@@ -45,6 +45,8 @@ $CAT1EXT=@CAT1EXT@
$CAT3EXT=@CAT3EXT@ $CAT3EXT=@CAT3EXT@
$DSONAME=@DSONAME@ $DSONAME=@DSONAME@
$FLDSONAME=@FLDSONAME@
$FLLIBNAME=@FLLIBNAME@
$GLDSONAME=@GLDSONAME@ $GLDSONAME=@GLDSONAME@
$GLLIBNAME=@GLLIBNAME@ $GLLIBNAME=@GLLIBNAME@
@@ -81,6 +83,19 @@ l 0000 root sys $libdir/libfltk.so libfltk.so.@FL_API_VERSION@
%system all %system all
%endif %endif
%system aix
f 0555 root sys $libdir/libfltk_forms_s.a src/libfltk_forms_s.a
%system hpux
f 0555 root sys $libdir/libfltk_forms.sl.@FL_API_VERSION@ src/libfltk_forms.sl.@FL_API_VERSION@
l 0000 root sys $libdir/libfltk_forms.sl libfltk_forms.sl.@FL_API_VERSION@
%system darwin freebsd openbsd netbsd
f 0555 root sys $libdir/libfltk_forms.dylib.@FL_API_VERSION@ src/libfltk_forms.dylib.@FL_API_VERSION@
l 0000 root sys $libdir/libfltk_forms.dylib libfltk_forms.dylib.@FL_API_VERSION@
%system !aix !darwin !freebsd !openbsd !netbsd !hpux
f 0555 root sys $libdir/libfltk_forms.so.@FL_API_VERSION@ src/libfltk_forms.so.@FL_API_VERSION@
l 0000 root sys $libdir/libfltk_forms.so libfltk_forms.so.@FL_API_VERSION@
%system all
%if GLDSONAME %if GLDSONAME
%system aix %system aix
f 0555 root sys $libdir/libfltk_gl_s.a src/libfltk_gl_s.a f 0555 root sys $libdir/libfltk_gl_s.a src/libfltk_gl_s.a
@@ -217,5 +232,5 @@ f 0444 root sys $datadir/doc/fltk/COPYING COPYING
f 0444 root sys $datadir/doc/fltk/CHANGES CHANGES f 0444 root sys $datadir/doc/fltk/CHANGES CHANGES
# #
# End of "$Id: fltk.list.in,v 1.1.2.4 2002/01/07 18:47:27 easysw Exp $". # End of "$Id: fltk.list.in,v 1.1.2.5 2002/03/25 21:39:01 easysw Exp $".
# #
fltk.spec
+3 -3
View File
@@ -1,5 +1,5 @@
# #
# "$Id: fltk.spec,v 1.1.2.9.2.7 2002/01/01 15:11:27 easysw Exp $" # "$Id: fltk.spec,v 1.1.2.9.2.8 2002/03/25 21:39:01 easysw Exp $"
# #
# RPM spec file for FLTK. # RPM spec file for FLTK.
# #
@@ -23,7 +23,7 @@
# Please report all bugs and problems to "fltk-bugs@fltk.org". # Please report all bugs and problems to "fltk-bugs@fltk.org".
# #
%define version 1.1.0b9 %define version 1.1.0b12
%define release 0 %define release 0
%define prefix /usr %define prefix /usr
@@ -99,5 +99,5 @@ rm -rf $RPM_BUILD_ROOT
%{prefix}/share/doc/fltk/* %{prefix}/share/doc/fltk/*
# #
# End of "$Id: fltk.spec,v 1.1.2.9.2.7 2002/01/01 15:11:27 easysw Exp $". # End of "$Id: fltk.spec,v 1.1.2.9.2.8 2002/03/25 21:39:01 easysw Exp $".
# #
fluid/Makefile
+3 -3
View File
@@ -1,5 +1,5 @@
# #
# "$Id: Makefile,v 1.10.2.6.2.15 2002/03/25 20:09:12 easysw Exp $" # "$Id: Makefile,v 1.10.2.6.2.16 2002/03/25 21:39:01 easysw Exp $"
# #
# FLUID makefile for the Fast Light Tool Kit (FLTK). # FLUID makefile for the Fast Light Tool Kit (FLTK).
# #
@@ -52,7 +52,7 @@ include ../makeinclude
$(PROGRAM) : $(OBJECTS) ../lib/$(LIBNAME) $(PROGRAM) : $(OBJECTS) ../lib/$(LIBNAME)
echo Linking $@... echo Linking $@...
$(CXX) $(CXXFLAGS) -o $(PROGRAM) $(OBJECTS) $(LINKFLTK) \ $(CXX) $(CXXFLAGS) -o $(PROGRAM) $(OBJECTS) $(LINKFLTKFORMS) \
$(IMAGELIBS) $(LDLIBS) $(IMAGELIBS) $(LDLIBS)
$(POSTBUILD) $@ ../FL/mac.r $(POSTBUILD) $@ ../FL/mac.r
@@ -86,5 +86,5 @@ rebuild:
./fluid -c widget_panel.fl ./fluid -c widget_panel.fl
# #
# End of "$Id: Makefile,v 1.10.2.6.2.15 2002/03/25 20:09:12 easysw Exp $". # End of "$Id: Makefile,v 1.10.2.6.2.16 2002/03/25 21:39:01 easysw Exp $".
# #
makeinclude.in
+5 -2
View File
@@ -1,5 +1,5 @@
# #
# "$Id: makeinclude.in,v 1.7.2.11.2.17 2002/01/15 12:39:09 easysw Exp $" # "$Id: makeinclude.in,v 1.7.2.11.2.18 2002/03/25 21:39:01 easysw Exp $"
# #
# Make include file for the Fast Light Tool Kit (FLTK). # Make include file for the Fast Light Tool Kit (FLTK).
# @configure_input@ # @configure_input@
@@ -51,10 +51,12 @@ CXXFLAGS =$(OPTIM) @CXXFLAGS@
# program to make the archive: # program to make the archive:
LIBNAME =@LIBNAME@ LIBNAME =@LIBNAME@
FLLIBNAME =@FLLIBNAME@
GLLIBNAME =@GLLIBNAME@ GLLIBNAME =@GLLIBNAME@
LIBCOMMAND =@LIBCOMMAND@ LIBCOMMAND =@LIBCOMMAND@
RANLIB =@RANLIB@ RANLIB =@RANLIB@
DSONAME =@DSONAME@ DSONAME =@DSONAME@
FLDSONAME =@FLDSONAME@
GLDSONAME =@GLDSONAME@ GLDSONAME =@GLDSONAME@
DSOCOMMAND =@DSOCOMMAND@ DSOCOMMAND =@DSOCOMMAND@
@@ -63,6 +65,7 @@ LDLIBS =@LDFLAGS@ @LIBS@ $(LDFLAGS_MIPSPRO)
GLDLIBS =@LDFLAGS@ @GLLIB@ @LIBS@ $(LDFLAGS_MIPSPRO) GLDLIBS =@LDFLAGS@ @GLLIB@ @LIBS@ $(LDFLAGS_MIPSPRO)
LINKFLTK =-L../lib @LINKFLTK@ LINKFLTK =-L../lib @LINKFLTK@
LINKFLTKGL =-L../lib @LINKFLTKGL@ LINKFLTKGL =-L../lib @LINKFLTKGL@
LINKFLTKFORMS =-L../lib -lfltk_forms @LINKFLTK@
IMAGELIBS =@IMAGELIBS@ IMAGELIBS =@IMAGELIBS@
# Do we build the OpenGL demos? # Do we build the OpenGL demos?
@@ -113,5 +116,5 @@ CAT3EXT =@CAT3EXT@
mv t.z $@ mv t.z $@
# #
# End of "$Id: makeinclude.in,v 1.7.2.11.2.17 2002/01/15 12:39:09 easysw Exp $". # End of "$Id: makeinclude.in,v 1.7.2.11.2.18 2002/03/25 21:39:01 easysw Exp $".
# #
src/Makefile
+85 -10
View File
@@ -1,5 +1,5 @@
# #
# "$Id: Makefile,v 1.18.2.14.2.37 2002/03/08 13:13:14 easysw Exp $" # "$Id: Makefile,v 1.18.2.14.2.38 2002/03/25 21:39:01 easysw Exp $"
# #
# Library makefile for the Fast Light Tool Kit (FLTK). # Library makefile for the Fast Light Tool Kit (FLTK).
# #
@@ -150,7 +150,9 @@ CPPFILES = \
fl_shortcut.cxx \ fl_shortcut.cxx \
fl_show_colormap.cxx \ fl_show_colormap.cxx \
fl_symbols.cxx \ fl_symbols.cxx \
fl_vertex.cxx \ fl_vertex.cxx
FLCPPFILES = \
forms_compatability.cxx \ forms_compatability.cxx \
forms_bitmap.cxx \ forms_bitmap.cxx \
forms_free.cxx \ forms_free.cxx \
@@ -177,8 +179,9 @@ include ../makeinclude
OBJECTS = $(CPPFILES:.cxx=.o) $(CFILES:.c=.o) OBJECTS = $(CPPFILES:.cxx=.o) $(CFILES:.c=.o)
GLOBJECTS = $(GLCPPFILES:.cxx=.o) GLOBJECTS = $(GLCPPFILES:.cxx=.o)
FLOBJECTS = $(FLCPPFILES:.cxx=.o)
all: $(LIBNAME) $(DSONAME) $(GLLIBNAME) $(GLDSONAME) all: $(LIBNAME) $(DSONAME) $(FLLIBNAME) $(FLDSONAME) $(GLLIBNAME) $(GLDSONAME)
$(LIBNAME): $(OBJECTS) $(LIBNAME): $(OBJECTS)
echo $(LIBCOMMAND) $@ ... echo $(LIBCOMMAND) $@ ...
@@ -198,6 +201,24 @@ libfltk_s.a: $(OBJECTS)
$(LIBCOMMAND) libfltk_s.a libfltk_s.o $(LIBCOMMAND) libfltk_s.a libfltk_s.o
chmod +x libfltk_s.a chmod +x libfltk_s.a
$(FLLIBNAME): $(FLOBJECTS)
echo $(LIBCOMMAND) $@ ...
-$(RM) $@
$(LIBCOMMAND) $@ $(FLOBJECTS)
$(RANLIB) $@
libfltk_forms.so.1.1 libfltk_forms.sl.1.1: $(FLOBJECTS)
echo $(DSOCOMMAND) $@ ...
$(DSOCOMMAND) $@ $(FLOBJECTS)
libfltk_forms_s.a: $(FLOBJECTS)
echo $(DSOCOMMAND) libfltk_forms_s.o ...
$(DSOCOMMAND) libfltk_forms_s.o $(FLOBJECTS)
echo $(LIBCOMMAND) libfltk_forms_s.a libfltk_forms_s.o
-$(RM) $@
$(LIBCOMMAND) libfltk_forms_s.a libfltk_forms_s.o
chmod +x libfltk_forms_s.a
$(GLLIBNAME): $(GLOBJECTS) $(GLLIBNAME): $(GLOBJECTS)
echo $(LIBCOMMAND) $@ ... echo $(LIBCOMMAND) $@ ...
-$(RM) $@ -$(RM) $@
@@ -219,7 +240,7 @@ libfltk_gl_s.a: $(GLOBJECTS)
clean : clean :
-@ rm -f *.o $(DSONAME) $(GLDSONAME) $(LIBRARY) $(CLEAN) libfltk.so libfltk_gl.so -@ rm -f *.o $(DSONAME) $(GLDSONAME) $(LIBRARY) $(CLEAN) libfltk.so libfltk_gl.so
depend: $(CPPFILES) $(GLCPPFILES) $(CFILES) depend: $(CPPFILES) $(FLCPPFILES) $(GLCPPFILES) $(CFILES)
makedepend -Y -I.. -f makedepend $(CPPFILES) $(GLCPPFILES) $(CFILES) makedepend -Y -I.. -f makedepend $(CPPFILES) $(GLCPPFILES) $(CFILES)
# Automatically generated dependencies... # Automatically generated dependencies...
@@ -227,10 +248,10 @@ include makedepend
# These dependencies aren't part of the makedepend file since # These dependencies aren't part of the makedepend file since
# they are part of the WIN32 and MacOS code base... # they are part of the WIN32 and MacOS code base...
Fl_cutpaste.o: Fl_cutpaste_mac.cxx Fl_cutpaste_win32.cxx
Fl_get_key.o: Fl_get_key_mac.cxx Fl_get_key_win32.cxx Fl_get_key.o: Fl_get_key_mac.cxx Fl_get_key_win32.cxx
Fl_x.o: Fl_mac.cxx Fl_win32.cxx Fl_x.o: Fl_mac.cxx Fl_win32.cxx
fl_color.o: fl_color_mac.cxx fl_color_win32.cxx fl_color.o: fl_color_mac.cxx fl_color_win32.cxx
fl_dnd.o: fl_dnd_mac.cxx fl_dnd_win32.cxx fl_dnd_x.cxx
fl_draw_image.o: fl_draw_image_mac.cxx fl_draw_image_win32.cxx fl_draw_image.o: fl_draw_image_mac.cxx fl_draw_image_win32.cxx
fl_font.o: fl_font_mac.cxx fl_font_x.cxx fl_font_xft.cxx fl_font_win32.cxx fl_font.o: fl_font_mac.cxx fl_font_x.cxx fl_font_xft.cxx fl_font_win32.cxx
fl_set_fonts.o: fl_set_fonts_mac.cxx fl_set_fonts_x.cxx \ fl_set_fonts.o: fl_set_fonts_mac.cxx fl_set_fonts_x.cxx \
@@ -242,8 +263,7 @@ fl_ask.o: ../FL/mac.H ../FL/win32.H
Fl_Bitmap.o: ../FL/mac.H ../FL/win32.H Fl_Bitmap.o: ../FL/mac.H ../FL/win32.H
fl_color.o: ../FL/mac.H ../FL/win32.H fl_color.o: ../FL/mac.H ../FL/win32.H
fl_cursor.o: ../FL/mac.H ../FL/win32.H fl_cursor.o: ../FL/mac.H ../FL/win32.H
Fl_cutpaste.o: ../FL/mac.H ../FL/win32.H fl_dnd.o: ../FL/mac.H ../FL/win32.H
Fl_cutpaste_win32.o: ../FL/mac.H ../FL/win32.H
Fl.o: ../FL/mac.H ../FL/win32.H Fl.o: ../FL/mac.H ../FL/win32.H
Fl_Double_Window.o: ../FL/mac.H ../FL/win32.H Fl_Double_Window.o: ../FL/mac.H ../FL/win32.H
fl_draw_image.o: ../FL/mac.H ../FL/win32.H fl_draw_image.o: ../FL/mac.H ../FL/win32.H
@@ -282,12 +302,13 @@ gl_start.o: ../FL/mac.H ../FL/win32.H
################################################################ ################################################################
install: $(LIBNAME) $(DSONAME) $(GLLIBNAME) $(GLDSONAME) install: $(LIBNAME) $(DSONAME) $(FLLIBNAME) $(FLDSONAME) $(GLLIBNAME) $(GLDSONAME)
echo "Installing libraries in $(libdir)..." echo "Installing libraries in $(libdir)..."
-mkdir -p $(libdir) -mkdir -p $(libdir)
rm -f $(libdir)/$(LIBNAME) rm -f $(libdir)/$(LIBNAME)
-cp $(LIBNAME) $(GLLIBNAME) $(libdir) -cp $(LIBNAME) $(FLLIBNAME) $(GLLIBNAME) $(libdir)
$(RANLIB) $(libdir)/$(LIBNAME) $(RANLIB) $(libdir)/$(LIBNAME)
$(RANLIB) $(libdir)/$(FLLIBNAME)
if test x$(GLLIBNAME) != x; then \ if test x$(GLLIBNAME) != x; then \
$(RANLIB) $(libdir)/$(GLLIBNAME); \ $(RANLIB) $(libdir)/$(GLLIBNAME); \
fi fi
@@ -303,11 +324,40 @@ install: $(LIBNAME) $(DSONAME) $(GLLIBNAME) $(GLDSONAME)
chmod 755 $(libdir)/libfltk.sl.1.1; \ chmod 755 $(libdir)/libfltk.sl.1.1; \
ln -s libfltk.sl.1.1 $(libdir)/libfltk.sl;\ ln -s libfltk.sl.1.1 $(libdir)/libfltk.sl;\
fi fi
if test x$(DSONAME) = xlibfltk.1.1.dylib; then\
rm -f $(libdir)/libfltk.*dylib;\
cp libfltk.1.1.dylib $(libdir); \
chmod 755 $(libdir)/libfltk.1.1.dylib; \
ln -s libfltk.1.1.dylib $(libdir)/libfltk.dylib;\
fi
if test x$(DSONAME) = xlibfltk_s.a; then\ if test x$(DSONAME) = xlibfltk_s.a; then\
rm -f $(libdir)/libfltk_s.a;\ rm -f $(libdir)/libfltk_s.a;\
cp libfltk_s.a $(libdir); \ cp libfltk_s.a $(libdir); \
chmod 755 $(libdir)/libfltk_s.a; \ chmod 755 $(libdir)/libfltk_s.a; \
fi fi
if test x$(FLDSONAME) = xlibfltk_forms.so.1.1; then\
rm -f $(libdir)/libfltk_forms.so*;\
cp libfltk_forms.so.1.1 $(libdir); \
chmod 755 $(libdir)/libfltk_forms.so.1.1; \
ln -s libfltk_forms.so.1.1 $(libdir)/libfltk_forms.so;\
fi
if test x$(FLDSONAME) = xlibfltk_forms.sl.1.1; then\
rm -f $(libdir)/libfltk_forms.sl*;\
cp libfltk_forms.sl.1.1 $(libdir); \
chmod 755 $(libdir)/libfltk_forms.sl.1.1; \
ln -s libfltk_forms.sl.1.1 $(libdir)/libfltk_forms.sl;\
fi
if test x$(FLDSONAME) = xlibfltk_forms.1.1.dylib; then\
rm -f $(libdir)/libfltk_forms.*dylib;\
cp libfltk_forms.1.1.dylib $(libdir); \
chmod 755 $(libdir)/libfltk_forms.1.1.dylib; \
ln -s libfltk_forms.1.1.dylib $(libdir)/libfltk_forms.dylib;\
fi
if test x$(FLDSONAME) = xlibfltk_forms_s.a; then\
rm -f $(libdir)/libfltk_forms_s.a;\
cp libfltk_forms_s.a $(libdir); \
chmod 755 $(libdir)/libfltk_forms.a; \
fi
if test x$(GLDSONAME) = xlibfltk_gl.so.1.1; then\ if test x$(GLDSONAME) = xlibfltk_gl.so.1.1; then\
rm -f $(libdir)/libfltk_gl.so*;\ rm -f $(libdir)/libfltk_gl.so*;\
cp libfltk_gl.so.1.1 $(libdir); \ cp libfltk_gl.so.1.1 $(libdir); \
@@ -320,6 +370,12 @@ install: $(LIBNAME) $(DSONAME) $(GLLIBNAME) $(GLDSONAME)
chmod 755 $(libdir)/libfltk_gl.sl.1.1; \ chmod 755 $(libdir)/libfltk_gl.sl.1.1; \
ln -s libfltk_gl.sl.1.1 $(libdir)/libfltk_gl.sl;\ ln -s libfltk_gl.sl.1.1 $(libdir)/libfltk_gl.sl;\
fi fi
if test x$(GLDSONAME) = xlibfltk_gl.1.1.dylib; then\
rm -f $(libdir)/libfltk_gl.*dylib;\
cp libfltk_gl.1.1.dylib $(libdir); \
chmod 755 $(libdir)/libfltk_gl.1.1.dylib; \
ln -s libfltk_gl.1.1.dylib $(libdir)/libfltk_gl.dylib;\
fi
if test x$(GLDSONAME) = xlibfltk_gl_s.a; then\ if test x$(GLDSONAME) = xlibfltk_gl_s.a; then\
rm -f $(libdir)/libfltk_gl_s.a;\ rm -f $(libdir)/libfltk_gl_s.a;\
cp libfltk_gl_s.a $(libdir); \ cp libfltk_gl_s.a $(libdir); \
@@ -335,9 +391,25 @@ uninstall:
if test x$(DSONAME) = xlibfltk.sl.1.1; then\ if test x$(DSONAME) = xlibfltk.sl.1.1; then\
rm -f $(libdir)/libfltk.sl*;\ rm -f $(libdir)/libfltk.sl*;\
fi fi
if test x$(DSONAME) = xlibfltk.1.1.dylib; then\
rm -f $(libdir)/libfltk.*dylib;\
fi
if test x$(DSONAME) = xlibfltk_s.a; then\ if test x$(DSONAME) = xlibfltk_s.a; then\
rm -f $(libdir)/libfltk_s.a;\ rm -f $(libdir)/libfltk_s.a;\
fi fi
rm -f $(libdir)/$(FLLIBNAME);
if test x$(FLDSONAME) = xlibfltk_forms.so.1.1; then\
rm -f $(libdir)/libfltk_forms.so*;\
fi
if test x$(FLDSONAME) = xlibfltk_forms.sl.1.1; then\
rm -f $(libdir)/libfltk_forms.sl*;\
fi
if test x$(FLDSONAME) = xlibfltk_forms.1.1.dylib; then\
rm -f $(libdir)/libfltk_forms.*dylib;\
fi
if test x$(FLDSONAME) = xlibfltk_forms_s.a; then\
rm -f $(libdir)/libfltk_forms_s.a;\
fi
if test x$(GLLIBNAME) != x; then\ if test x$(GLLIBNAME) != x; then\
rm -f $(libdir)/$(GLLIBNAME);\ rm -f $(libdir)/$(GLLIBNAME);\
fi fi
@@ -347,11 +419,14 @@ uninstall:
if test x$(GLDSONAME) = xlibfltk_gl.sl.1.1; then\ if test x$(GLDSONAME) = xlibfltk_gl.sl.1.1; then\
rm -f $(libdir)/libfltk_gl.sl*;\ rm -f $(libdir)/libfltk_gl.sl*;\
fi fi
if test x$(GLDSONAME) = xlibfltk_gl.1.1.dylib; then\
rm -f $(libdir)/libfltk_gl.*dylib;\
fi
if test x$(GLDSONAME) = xlibfltk_gl_s.a; then\ if test x$(GLDSONAME) = xlibfltk_gl_s.a; then\
rm -f $(libdir)/libfltk_gl_s.a;\ rm -f $(libdir)/libfltk_gl_s.a;\
fi fi
# #
# End of "$Id: Makefile,v 1.18.2.14.2.37 2002/03/08 13:13:14 easysw Exp $". # End of "$Id: Makefile,v 1.18.2.14.2.38 2002/03/25 21:39:01 easysw Exp $".
# #
test/Makefile
+17 -2
View File
@@ -1,5 +1,5 @@
# #
# "$Id: Makefile,v 1.19.2.7.2.29 2002/01/15 01:33:16 easysw Exp $" # "$Id: Makefile,v 1.19.2.7.2.30 2002/03/25 21:39:01 easysw Exp $"
# #
# Test/example program makefile for the Fast Light Tool Kit (FLTK). # Test/example program makefile for the Fast Light Tool Kit (FLTK).
# #
@@ -199,6 +199,9 @@ checkers$(EXEEXT): checkers.o
clock$(EXEEXT): clock.o clock$(EXEEXT): clock.o
colbrowser$(EXEEXT): colbrowser.o colbrowser$(EXEEXT): colbrowser.o
echo Linking $@...
$(CXX) -I.. $(CXXFLAGS) $< -o $@ $(LINKFLTKFORMS) $(LDLIBS)
$(POSTBUILD) $@ ../FL/mac.r
color_chooser$(EXEEXT): color_chooser.o color_chooser$(EXEEXT): color_chooser.o
@@ -207,6 +210,9 @@ cursor$(EXEEXT): cursor.o
curve$(EXEEXT): curve.o curve$(EXEEXT): curve.o
demo$(EXEEXT): demo.o demo$(EXEEXT): demo.o
echo Linking $@...
$(CXX) -I.. $(CXXFLAGS) $< -o $@ $(LINKFLTKFORMS) $(LDLIBS)
$(POSTBUILD) $@ ../FL/mac.r
doublebuffer$(EXEEXT): doublebuffer.o doublebuffer$(EXEEXT): doublebuffer.o
@@ -226,6 +232,9 @@ file_chooser$(EXEEXT): file_chooser.o
fonts$(EXEEXT): fonts.o fonts$(EXEEXT): fonts.o
forms$(EXEEXT): forms.o forms$(EXEEXT): forms.o
echo Linking $@...
$(CXX) -I.. $(CXXFLAGS) $< -o $@ $(LINKFLTKFORMS) $(LDLIBS)
$(POSTBUILD) $@ ../FL/mac.r
hello$(EXEEXT): hello.o hello$(EXEEXT): hello.o
@@ -250,6 +259,9 @@ keyboard$(EXEEXT): keyboard_ui.o keyboard.o
keyboard_ui.o: keyboard_ui.h ../fluid/fluid keyboard_ui.o: keyboard_ui.h ../fluid/fluid
label$(EXEEXT): label.o label$(EXEEXT): label.o
echo Linking $@...
$(CXX) -I.. $(CXXFLAGS) $< -o $@ $(LINKFLTKFORMS) $(LDLIBS)
$(POSTBUILD) $@ ../FL/mac.r
line_style$(EXEEXT): line_style.o line_style$(EXEEXT): line_style.o
@@ -270,6 +282,9 @@ minimum$(EXEEXT): minimum.o
navigation$(EXEEXT): navigation.o navigation$(EXEEXT): navigation.o
output$(EXEEXT): output.o output$(EXEEXT): output.o
echo Linking $@...
$(CXX) -I.. $(CXXFLAGS) $< -o $@ $(LINKFLTKFORMS) $(LDLIBS)
$(POSTBUILD) $@ ../FL/mac.r
overlay$(EXEEXT): overlay.o overlay$(EXEEXT): overlay.o
@@ -354,5 +369,5 @@ shape$(EXEEXT): shape.o
# #
# End of "$Id: Makefile,v 1.19.2.7.2.29 2002/01/15 01:33:16 easysw Exp $". # End of "$Id: Makefile,v 1.19.2.7.2.30 2002/03/25 21:39:01 easysw Exp $".
# #