Commit 8dcaeaaa authored by Aaron M. Ucko's avatar Aaron M. Ucko

[svn-upgrade] Integrating new upstream version, fltk1.1 (1.1.8~rc1)

parent a92c24f6
......@@ -6,15 +6,20 @@ CHANGES IN FLTK 1.1.8
STR #1742, STR #1777, STR #1794, STR #1827, STR #1843,
STR #1796, STR #1815, STR #1726, STR #1753, STR #1855,
STR #1862, STR #1867, STR #1874)
- Fixed image read for partial regions on X11
(STR #1716)
- Fixed KDE/Gnome icon paths (STR #1795)
- Fixed Tab key to wrap around menu bars (STR #1877)
- Fixed possible timer leak in Scrollbar (STR #1880)
- Added documentation about the potential limitations
of Fl::grab on newer operating systems (STR #1747)
- Fixed lockout when mixing popups and alerts
(STR # 1869)
- Fixed recursion crash in event handling (STR #1873)
- Fixed missing return coe in 'fltk-config' (STR #1875)
- Fixed missing return code in 'fltk-config' (STR #1875)
- Fixed inconsistencies with CHANGED flags (STR #1719)
- Fixed message sent to hidden widgets (STR #1849)
- Fixed width calculation in Fl_Help_ViewA (STR #1868)
- Fixed width calculation in Fl_Help_View (STR #1868)
- Fixed offset bug in OS X pixmap code (STR #1856)
- Fixed potential buffer overrun
in Fl_Preferences (STR #1853)
......@@ -70,8 +75,7 @@ CHANGES IN FLTK 1.1.8
accomodate for a missing '-d' option (STR #1632)
- New option in Fluid project settings to translate all
shortcut modifiers from FL_META or FL_CTRL to FL_COMMAND
- Added static icon, text selection, and HTML formatting to
fl_message etc. (STR #1626)
- Made icon size fixed (50x50) in fl_message etc. (STR #1626)
- Fixed selection of first word in Fl_Help_View
- Fixed endless loop in Fl_Text_Display (STR #1655)
- Allowing shortcuts in Tabs (STR #1652)
......@@ -80,7 +84,7 @@ CHANGES IN FLTK 1.1.8
- The sample RPM spec file now enables large file support
and threading support (STR #1603)
- Changed minimum contrast between background and text to
96 and added more weight to the blue component to improve
99 and added more weight to the blue component to improve
readability for certain color combinations (STR #1625)
- Fixed VCNet OpenGL project file (STR #1617)
- Fixed scrolling of clipped areas in MSWindows (STR
......@@ -135,7 +139,7 @@ CHANGES IN FLTK 1.1.8
- OS X resource fork now obsolete (STR #1453)
- Added chapter 10 about multithreading (STR #1532,
1533)
- OS X system menu bar itop level attribute support
- OS X system menu bar top level attribute support
improved (STR #1505)
- Fixed Quartz image drawing bug (STR #1438)
- Fixed Quartz fl_read_image
......@@ -224,17 +228,17 @@ CHANGES IN FLTK 1.1.8
- Fixed speed issues when measuring text on OS X with
Quartz (STR #1386).
- Fixed focus issues on OS X (STR #1377)
- Optional precission argument when storing floats or
- Optional precision argument when storing floats or
doubles in a Preferences file (STR #1381)
- Fixed callback not called when using arrow keys in
Fl_Slider (STR #1333)
- Changing the shorcut of a widget in fluid now marks the
- Changing the shortcut of a widget in fluid now marks the
document as dirty (STR #1382)
- Fl_Text_Editor now correctly handles middle mouse
clicks (STR #1384)
- Added some GLUT4 functions (STR #1370)
- Added "context_changed()" function for OpenGL windows
which allows efficent texture loading (STR #1372)
which allows efficient texture loading (STR #1372)
- Added missing "const" to GLUT call (STR #1371)
- Fixed stray FL_RELEASE events after clicking system
areas on OS X (STR #1376)
......@@ -274,7 +278,7 @@ CHANGES IN FLTK 1.1.8
- Updated documentation to reflect limitation of
Fl::delete_widget() (STR #1306)
- Fixed line wrapping in Fl_Text_Display (STR #1227)
- New function Fl::event_original_key() returns key code
- New function Fl::event_original_key() returns key code
before NumLock handling.
- Many OS X Quartz fixes (STR #1310, etc.)
- Fixed shortcut and default focus for message dialogs
......
//
// "$Id: Fl_Scrollbar.H 4288 2005-04-16 00:13:17Z mike $"
// "$Id: Fl_Scrollbar.H 6042 2008-02-25 13:00:53Z matt $"
//
// Scroll bar header file for the Fast Light Tool Kit (FLTK).
//
......@@ -42,6 +42,7 @@ protected:
public:
Fl_Scrollbar(int x,int y,int w,int h, const char *l = 0);
~Fl_Scrollbar();
int handle(int);
int value() {return int(Fl_Slider::value());}
......@@ -56,5 +57,5 @@ public:
#endif
//
// End of "$Id: Fl_Scrollbar.H 4288 2005-04-16 00:13:17Z mike $".
// End of "$Id: Fl_Scrollbar.H 6042 2008-02-25 13:00:53Z matt $".
//
//
// "$Id: glut.h 4052 2005-02-24 21:55:12Z mike $"
//
// GLUT compatibility header for the Fast Light Tool Kit (FLTK).
//
// Copyright 1998-2005 by Bill Spitzak and others.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Library General Public
// License as published by the Free Software Foundation; either
// version 2 of the License, or (at your option) any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Library General Public License for more details.
//
// You should have received a copy of the GNU Library General Public
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA.
//
// Please report all bugs and problems to "fltk-bugs@fltk.org".
//
#include <FL/glut.H>
//
// End of "$Id: glut.h 4052 2005-02-24 21:55:12Z mike $".
//
README - Fast Light Tool Kit (FLTK) Version 1.1.7
README - Fast Light Tool Kit (FLTK) Version 1.1.8
-------------------------------------------------
WHAT IS FLTK?
......
/*
* "$Id: config.h 4052 2005-02-24 21:55:12Z mike $"
*
* Configuration file for the Fast Light Tool Kit (FLTK).
*
* Copyright 1998-2001 by Bill Spitzak and others.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA.
*
* Please report all bugs and problems to "FLTK-bugs@easysw.com".
*/
/*
* BORDER_WIDTH:
*
* Thickness of FL_UP_BOX and FL_DOWN_BOX. Current 1,2, and 3 are
* supported.
*
* 3 is the historic FLTK look.
* 2 is the default and looks like Microsoft Windows, KDE, and Qt.
* 1 is a plausible future evolution...
*
* Note that this may be simulated at runtime by redefining the boxtypes
* using Fl::set_boxtype().
*/
#define BORDER_WIDTH 2
/*
* HAVE_GL:
*
* Do you have OpenGL? Set this to 0 if you don't have or plan to use
* OpenGL, and FLTK will be smaller.
*/
#define HAVE_GL 1
/*
* USE_COLORMAP:
*
* Setting this to zero will save a good deal of code (especially for
* fl_draw_image), but FLTK will only work on TrueColor visuals.
*/
#define USE_COLORMAP 1
/*
* HAVE_XDBE:
*
* Do we have the X double-buffer extension?
*/
#define HAVE_XDBE 0
/*
* USE_XDBE:
*
* Actually try to use the double-buffer extension? Set this to zero
* disable use of XDBE without breaking the list_visuals program.
*/
#define USE_XDBE HAVE_XDBE
/*
* HAVE_OVERLAY:
*
* Use the X overlay extension? FLTK will try to use an overlay
* visual for Fl_Overlay_Window, the Gl_Window overlay, and for the
* menus. Setting this to zero will remove a substantial amount of
* code from FLTK. Overlays have only been tested on SGI servers!
*/
#define HAVE_OVERLAY 0
/*
* HAVE_GL_OVERLAY:
*
* It is possible your GL has an overlay even if X does not. If so,
* set this to 1.
*/
#define HAVE_GL_OVERLAY HAVE_OVERLAY
/*
* WORDS_BIGENDIAN:
*
* Byte order of your machine: 1 = big-endian, 0 = little-endian.
*/
#define WORDS_BIGENDIAN 0
/*
* U16, U32, U64:
*
* Types used by fl_draw_image. One of U32 or U64 must be defined.
* U16 is optional but FLTK will work better with it!
*/
#define U16 unsigned short
#define U32 unsigned
/* #undef U64 */
/*
* HAVE_DIRENT_H, HAVE_SYS_NDIR_H, HAVE_SYS_DIR_H, HAVE_NDIR_H, HAVE_SCANDIR:
*
* Where is <dirent.h> (used only by fl_file_chooser and scandir).
*/
#define HAVE_DIRENT_H 1
#define HAVE_SYS_NDIR_H 0
#define HAVE_SYS_DIR_H 0
#define HAVE_NDIR_H 0
#define HAVE_SCANDIR 0
/*
* possibly missing sprintf-style functions:
*/
#define HAVE_VSNPRINTF 0
#define HAVE_SNPRINTF 0
/*
* HAVE_SYS_SELECT_H:
*
* Whether or not select() call has its own header file.
*/
#define HAVE_SYS_SELECT_H 0
/*
* HAVE_POLL:
*
* Use poll() if we don't have select().
*/
#define HAVE_POLL 0
/*
* End of "$Id: config.h 4052 2005-02-24 21:55:12Z mike $".
*/
......@@ -718,6 +718,7 @@ XPROP
GLLIB
HLINKS
POSTBUILD
OSX_ONLY
THREADS
INSTALL_DESKTOP
UNINSTALL_DESKTOP
......@@ -8837,6 +8838,7 @@ fi
HLINKS=
POSTBUILD=:
OSX_ONLY=:
THREADS=
......@@ -9197,6 +9199,9 @@ _ACEOF
# Add a postbuild step after linking applications
POSTBUILD="/Developer/Tools/Rez -t APPL -o"
# Some steps are only done for OS X package management
OSX_ONLY=
# Install/Uninstall FLUID application
INSTALL_DESKTOP="install-osx"
UNINSTALL_DESKTOP="uninstall-osx"
......@@ -11600,6 +11605,7 @@ esac
case "$uname" in
*BSD* | Darwin*)
# *BSD
......@@ -12822,6 +12828,7 @@ XPROP!$XPROP$ac_delim
GLLIB!$GLLIB$ac_delim
HLINKS!$HLINKS$ac_delim
POSTBUILD!$POSTBUILD$ac_delim
OSX_ONLY!$OSX_ONLY$ac_delim
THREADS!$THREADS$ac_delim
INSTALL_DESKTOP!$INSTALL_DESKTOP$ac_delim
UNINSTALL_DESKTOP!$UNINSTALL_DESKTOP$ac_delim
......@@ -12833,7 +12840,7 @@ LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 17; then
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 18; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
......
dnl -*- sh -*-
dnl the "configure" script is made from this by running GNU "autoconf"
dnl
dnl "$Id: configure.in 5986 2007-11-20 21:52:54Z mike $"
dnl "$Id: configure.in 6051 2008-02-26 15:26:08Z matt $"
dnl
dnl Configuration script for the Fast Light Tool Kit (FLTK).
dnl
......@@ -600,6 +600,7 @@ AC_SUBST(PTHREAD_FLAGS)
dnl Define OS-specific stuff...
HLINKS=
POSTBUILD=:
OSX_ONLY=:
THREADS=
AC_ARG_WITH(links, [ --with-links make header links for common misspellings])
......@@ -680,6 +681,9 @@ case $uname in
# Add a postbuild step after linking applications
POSTBUILD="/Developer/Tools/Rez -t APPL -o"
# Some steps are only done for OS X package management
OSX_ONLY=
# Install/Uninstall FLUID application
INSTALL_DESKTOP="install-osx"
UNINSTALL_DESKTOP="uninstall-osx"
......@@ -815,6 +819,7 @@ AC_SUBST(GLDEMOS)
AC_SUBST(GLLIB)
AC_SUBST(HLINKS)
AC_SUBST(POSTBUILD)
AC_SUBST(OSX_ONLY)
AC_SUBST(THREADS)
AC_SUBST(INSTALL_DESKTOP)
......@@ -1151,5 +1156,5 @@ dnl Make sure the fltk-config script is executable...
chmod +x fltk-config
dnl
dnl End of "$Id: configure.in 5986 2007-11-20 21:52:54Z mike $".
dnl End of "$Id: configure.in 6051 2008-02-26 15:26:08Z matt $".
dnl
......@@ -945,7 +945,7 @@ and faster on the system.
while <tt>grab()</tt> is on. On X this will lock up your screen!</I>
To avoid this potential lockup, all newer operating systems seem to
limit mouse pointer grabbing to the time during which a mouse button
is held down. Some OS's may noy support grabbing at all.
is held down. Some OS's may not support grabbing at all.
<H4><A NAME="Fl.h">int h();</A></H4>
......
......@@ -274,6 +274,19 @@ const char *value()</A></H4>
<P>Sets or gets the current value of the selected file.
<P>In the second form, <i>file</i> is a <i>1</i>-based index into a list of
file names. The number of selected files is returned by
<CODE>Fl_File_Chooser::count()</CODE>.
<P>This sample code loops through all selected files:
<PRE>
// Get list of filenames user selected from a MULTI chooser
for ( int t=1; t<=chooser->count(); t++ ) {
const char *filename = chooser->value(t);
..
}
</PRE>
<H4><A NAME="Fl_File_Chooser.visible">int visible()</A></H4>
<P>Returns 1 if the <CODE>Fl_File_Chooser</CODE> window is visible.
......
......@@ -5,10 +5,22 @@
<BODY>
<H1 ALIGN="RIGHT"><A NAME="FLUID">9 - Programming with FLUID</A></H1>
This chapter shows how to use the Fast Light User-Interface Designer
(&quot;FLUID&quot;) to create your GUIs.
<P>This chapter shows how to use the Fast Light User-Interface Designer
(&quot;FLUID&quot;) to create your GUIs.</P>
<H2>What is FLUID?</H2>
<P>Subchapters:
<UL>
<LI><A HREF="#what_is_fluid">What is FLUID</A></LI>
<LI><A HREF="#fluid_under_linux">Running FLUID Under UNIX</A></LI>
<LI><A HREF="#fluid_under_windows">Running FLUID Under Microsoft Windows</A></LI>
<LI><A HREF="#compiling_fl_files">Compiling <TT>.fl</TT> files</A></LI>
<LI><A HREF="#tutorial">A Short Tutorial</A></LI>
<LI><A HREF="#references">FLUID Reference</A></LI>
<LI><A HREF="#I18N">Internationalization with FLUID</A></LI>
<LI><A HREF="#limitations">Know limitations</A></LI>
</UL></P>
<H2><A NAME="what_is_fluid">What is FLUID?</A></H2>
<P>The Fast Light User Interface Designer, or FLUID, is a
graphical editor that is used to produce FLTK source code. FLUID
......@@ -50,7 +62,7 @@ structures. An unnamed widget has a blank name and no pointer is stored.</P>
<P>Widgets may either call a named callback function that you write in
another source file, or you can supply a small piece of C++ source and
FLUID will write a private callback function into the <TT>.cxx</TT> file.</P>
<H2>Running FLUID Under UNIX</H2>
<H2><A NAME="fluid_under_linux">Running FLUID Under UNIX</A></H2>
To run FLUID under UNIX, type:
<UL>
<PRE>
......@@ -86,13 +98,13 @@ background with '&amp;' then you will be able to abort FLUID by
typing <KBD>CTRL-C</KBD> on the terminal. It will exit
immediately, losing any changes.</P>
<H2>Running FLUID Under Microsoft Windows</H2>
<H2><A NAME="fluid_under_windows">Running FLUID Under Microsoft Windows</A></H2>
<P>To run FLUID under WIN32, double-click on the <I>FLUID.exe</I>
file. You can also run FLUID from the Command Prompt window.
FLUID always runs in the background under WIN32.
<H2>Compiling <TT>.fl</TT> files</H2>
<H2><A NAME="compiling_fl_files">Compiling <TT>.fl</TT> files</A></H2>
<P>FLUID can also be called as a command-line
&quot;compiler&quot; to create the <TT>.cxx</TT> and <TT>.h</TT>
......@@ -125,7 +137,7 @@ files to be compiled:
fluid -c $&lt;
</PRE></UL>
<H2>A Short Tutorial</H2>
<H2><A NAME="tutorial">A Short Tutorial</A></H2>
<P>FLUID is an amazingly powerful little program. However, this
power comes at a price as it is not always obvious how to
......@@ -478,7 +490,7 @@ extensions and you are in business. You can include the CubeViewUI.h
<!-- NEW PAGE -->
<H2>FLUID Reference</H2>
<H2><A NAME="references">FLUID Reference</A></H2>
<P>The following sections describe each of the windows in FLUID.
......@@ -1338,5 +1350,14 @@ file to be used for all of the windows defined in your
<P>The "Set" field controls the set number in the catalog file.
The default set is 1 and rarely needs to be changed.
<H2><A NAME="limitations">Know limitations</A></H2>
Declaration Blocks can be used to temporarily block out already
designed code using <code>#if 0</code> and <code>#endif</code>
type construction. This will effectively avoid compilation of
blocks of code. However, static code and data generated by this
segment (menu items, images, include statements, etc.) will still
be generated and likely cause compile-time warnings.
</BODY>
</HTML>
#
# "$Id: fltk.list.in 5677 2007-02-08 19:17:47Z mike $"
# "$Id: fltk.list.in 6045 2008-02-25 14:43:34Z matt $"
#
# EPM product list file for the Fast Light Tool Kit (FLTK).
#
......@@ -129,7 +129,7 @@ f 0444 root sys /Applications/fluid.app/Contents/Resources/fluid.icns fluid/flui
%postremove /bin/rm -rf /Applications/fluid.app
%system !darwin
f 0444 root sys /usr/share/applnk/Development/fluid.desktop fluid/fluid.desktop
f 0444 root sys /usr/share/applications/fluid.desktop fluid/fluid.desktop
f 0444 root sys /usr/share/icons/hicolor/16x16/apps/fluid.png fluid/icons/fluid-16.png
f 0444 root sys /usr/share/icons/hicolor/32x32/apps/fluid.png fluid/icons/fluid-32.png
f 0444 root sys /usr/share/icons/hicolor/48x48/apps/fluid.png fluid/icons/fluid-48.png
......@@ -394,17 +394,17 @@ f 0444 root sys /Applications/sudoku.app/Contents/Resources/sudoku.icns test/sud
%system !darwin
f 0555 root sys $bindir/blocks test/blocks
f 0444 root sys /usr/share/applnk/Games/blocks.desktop test/desktop/blocks.desktop
f 0444 root sys /usr/share/applications/blocks.desktop test/desktop/blocks.desktop
f 0444 root sys /usr/share/icons/hicolor/32x32/apps/blocks.png test/icons/blocks-32.png
f 0444 root sys /usr/share/icons/hicolor/128x128/apps/blocks.png test/icons/blocks-128.png
f 0555 root sys $bindir/checkers test/checkers
f 0444 root sys /usr/share/applnk/Games/checkers.desktop test/desktop/checkers.desktop
f 0444 root sys /usr/share/applications/checkers.desktop test/desktop/checkers.desktop
f 0444 root sys /usr/share/icons/hicolor/32x32/apps/checkers.png test/icons/checkers-32.png
f 0444 root sys /usr/share/icons/hicolor/128x128/apps/checkers.png test/icons/checkers-128.png
f 0555 root sys $bindir/sudoku test/sudoku
f 0444 root sys /usr/share/applnk/Games/sudoku.desktop test/desktop/sudoku.desktop
f 0444 root sys /usr/share/applications/sudoku.desktop test/desktop/sudoku.desktop
f 0444 root sys /usr/share/icons/hicolor/32x32/apps/sudoku.png test/icons/sudoku-32.png
f 0444 root sys /usr/share/icons/hicolor/128x128/apps/sudoku.png test/icons/sudoku-128.png
......@@ -417,5 +417,5 @@ f 0444 root sys $mandir/man6/checkers.6 documentation/checkers.man
f 0444 root sys $mandir/man6/sudoku.6 documentation/sudoku.man
#
# End of "$Id: fltk.list.in 5677 2007-02-08 19:17:47Z mike $".
# End of "$Id: fltk.list.in 6045 2008-02-25 14:43:34Z matt $".
#
#
# "$Id: fltk.spec.in 6045 2008-02-25 14:43:34Z matt $"
#
# RPM spec file for FLTK.
#
# Copyright 1998-2007 by Bill Spitzak and others.
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Library General Public
# License as published by the Free Software Foundation; either
# version 2 of the License, or (at your option) any later version.
#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Library General Public License for more details.
#
# You should have received a copy of the GNU Library General Public
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA.
#
# Please report all bugs and problems on the following page:
#
# http://www.fltk.org/str.php
#
%define version @FL_MAJOR_VERSION@.@FL_MINOR_VERSION@.@FL_PATCH_VERSION@
%define release 1
%define prefix /usr
Summary: Fast Light Tool Kit (FLTK)
Name: fltk
Version: %{version}
Release: %{release}
License: LGPL
Group: System Environment/Libraries
Source: ftp://ftp.easysw.com/pub/fltk/1.1.8rc1.1/fltk-1.1.8rc1.1-source.tar.bz2
URL: http://www.fltk.org/
Packager: FLTK Developer <fltk@fltk.org>
# use BuildRoot so as not to disturb the version already installed
BuildRoot: /var/tmp/fltk-%{PACKAGE_VERSION}
%description
The Fast Light Tool Kit ("FLTK", pronounced "fulltick") is a
cross-platform C++ GUI toolkit for UNIX(r)/Linux(r) (X11),
Microsoft(r) Windows(r), and MacOS(r) X. FLTK provides modern
GUI functionality without the bloat and supports 3D graphics via
OpenGL(r) and its built-in GLUT emulation.
%package devel
Summary: FLTK Development Environment
Group: Development/Libraries
%description devel
Install fltk-devel if you need to develop FLTK applications.
You'll need to install the fltk package if you plan to run
dynamically linked applications.
%package games
Summary: FLTK Games
Group: Games
%description games
Install fltk-games to play Block Attack!, Checkers, or Sudoku on your computer.
%prep
%setup
%build
CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{prefix} --mandir=%{_mandir} --enable-largefile --enable-shared --enable-threads --enable-xft --enable-xdbe --enable-xinerama
# If we got this far, all prerequisite libraries must be here.
make
%install
# these lines just make sure the directory structure in the
# RPM_BUILD_ROOT exists
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT
make -e DESTDIR=$RPM_BUILD_ROOT install install-desktop
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
%dir %{prefix}/lib
%{prefix}/lib/libfltk*.so.*
%files devel
%defattr(-,root,root)
%dir %{prefix}/bin
%{prefix}/bin/fltk-config
%{prefix}/bin/fluid
%dir %{prefix}/include/FL
%{prefix}/include/FL/*
%{prefix}/include/Fl
%dir %{prefix}/lib
%{prefix}/lib/libfltk*.so
%{prefix}/lib/libfltk*.a
%dir %{_mandir}
%{_mandir}/cat1/*
%{_mandir}/cat3/*
%{_mandir}/man1/*
%{_mandir}/man3/*
%dir %{prefix}/share/doc/fltk
%{prefix}/share/doc/fltk/*
%dir %{prefix}/share/applications
%{prefix}/share/applications/*
%dir %{prefix}/share/icons
%{prefix}/share/icons/hicolor/*/apps/fluid.png
%dir %{prefix}/share/mimelnk
%{prefix}/share/mimelnk/*
%files games
%dir %{prefix}/bin
%{prefix}/bin/blocks
%{prefix}/bin/checkers
%{prefix}/bin/sudoku
%dir %{_mandir}
%{_mandir}/cat6/*
%{_mandir}/man6/*
%dir %{prefix}/share/applications
%{prefix}/share/applications/*
%dir %{prefix}/share/icons
%{prefix}/share/icons/hicolor/*/apps/blocks.png
%{prefix}/share/icons/hicolor/*/apps/checkers.png
%{prefix}/share/icons/hicolor/*/apps/sudoku.png
#
# End of "$Id: fltk.spec.in 6045 2008-02-25 14:43:34Z matt $".
#
#
# "$Id: fltk.spec.in 5707 2007-02-22 12:03:46Z mike $"
# "$Id: fltk.spec.in 6045 2008-02-25 14:43:34Z matt $"
#
# RPM spec file for FLTK.
#
......@@ -113,8 +113,8 @@ rm -rf $RPM_BUILD_ROOT
%dir %{prefix}/share/doc/fltk
%{prefix}/share/doc/fltk/*
%dir %{prefix}/share/applnk
%{prefix}/share/applnk/Development/*
%dir %{prefix}/share/applications
%{prefix}/share/applications/*
%dir %{prefix}/share/icons
%{prefix}/share/icons/hicolor/*/apps/fluid.png
......@@ -132,8 +132,8 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/cat6/*
%{_mandir}/man6/*
%dir %{prefix}/share/applnk
%{prefix}/share/applnk/Games/*
%dir %{prefix}/share/applications
%{prefix}/share/applications/*
%dir %{prefix}/share/icons
%{prefix}/share/icons/hicolor/*/apps/blocks.png
......@@ -141,5 +141,5 @@ rm -rf $RPM_BUILD_ROOT
%{prefix}/share/icons/hicolor/*/apps/sudoku.png
#
# End of "$Id: fltk.spec.in 5707 2007-02-22 12:03:46Z mike $".
# End of "$Id: fltk.spec.in 6045 2008-02-25 14:43:34Z matt $".
#
#
# "$Id: Makefile 5728 2007-03-06 17:03:25Z matt $"
# "$Id: Makefile 6051 2008-02-26 15:26:08Z matt $"
#
# FLUID makefile for the Fast Light Tool Kit (FLTK).
#
......@@ -58,7 +58,7 @@ fluid$(EXEEXT): $(OBJECTS) ../lib/$(LIBNAME) ../lib/$(FLLIBNAME) \
../lib/$(IMGLIBNAME)
echo Linking $@...
$(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS) $(LINKFLTKIMG) $(LDLIBS)
$(INSTALL_BIN) fluid fluid.app/Contents/MacOS
$(OSX_ONLY) $(INSTALL_BIN) fluid fluid.app/Contents/MacOS
$(POSTBUILD) $@ ../FL/mac.r
fluid-shared$(EXEEXT): $(OBJECTS) ../src/$(DSONAME) ../src/$(FLDSONAME) \
......@@ -70,7 +70,7 @@ fluid-shared$(EXEEXT): $(OBJECTS) ../src/$(DSONAME) ../src/$(FLDSONAME) \
clean:
-$(RM) *.o core.* *~ *.bck *.bck
-$(RM) core fluid$(EXEEXT) fluid-shared$(EXEEXT)
-$(RM) fluid.app/Contents/MacOS/fluid
-$(RM) fluid.app/Contents/MacOS/fluid$(EXEEXT)
depend: $(CPPFILES)
makedepend -Y -I.. -f makedepend $(CPPFILES)
......@@ -84,8 +84,8 @@ install: all
$(INSTALL_BIN) $(FLUID) $(DESTDIR)$(bindir)/fluid$(EXEEXT)
install-linux:
-$(INSTALL_DIR) $(DESTDIR)/usr/share/applnk/Development
$(INSTALL_DATA) fluid.desktop $(DESTDIR)/usr/share/applnk/Development
-$(INSTALL_DIR) $(DESTDIR)/usr/share/applications
$(INSTALL_DATA) fluid.desktop $(DESTDIR)/usr/share/applications
for size in 16 32 48 64 128; do \
if test ! -d $(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}/apps; then \
$(INSTALL_DIR) $(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}/apps; \
......@@ -111,7 +111,7 @@ uninstall:
$(RM) $(DESTDIR)$(bindir)/fluid$(EXEEXT)
uninstall-linux:
$(RM) $(DESTDIR)/usr/share/applnk/Development/fluid.desktop
$(RM) $(DESTDIR)/usr/share/applications/fluid.desktop
$(RM) $(DESTDIR)/usr/share/icons/hicolor/*/fluid.png
$(RM) $(DESTDIR)/usr/share/mimelnk/application/x-fluid.desktop
......@@ -133,5 +133,5 @@ rebuild:
./fluid -c widget_panel.fl
#
# End of "$Id: Makefile 5728 2007-03-06 17:03:25Z matt $".
# End of "$Id: Makefile 6051 2008-02-26 15:26:08Z matt $".
#
#
# "$Id: makeinclude.in 5988 2007-11-21 04:43:28Z mike $"
# "$Id: makeinclude.in 6051 2008-02-26 15:26:08Z matt $"
#
# Make include file for the Fast Light Tool Kit (FLTK).
#
......@@ -100,6 +100,9 @@ THREADS = @THREADS@
# Name of FLUID executable we install
FLUID = @FLUID@$(EXEEXT)
# Possible steps for OS X build only
OSX_ONLY = @OSX_ONLY@
# Possible steps after linking...
POSTBUILD = @POSTBUILD@
......@@ -155,5 +158,5 @@ UNINSTALL_DESKTOP = @UNINSTALL_DESKTOP@
mv t.z $@
#
# End of "$Id: makeinclude.in 5988 2007-11-21 04:43:28Z mike $".
# End of "$Id: makeinclude.in 6051 2008-02-26 15:26:08Z matt $".
#