Skip to content

Commit

Permalink
Add -sgi_version,sgi1.1 to the IRIX DSO command.
Browse files Browse the repository at this point in the history
Add Fl_Shared_Image.html to the list of HTML files to install.

Change C++ command to C in src/flstring.h.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2244 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
  • Loading branch information
michaelrsweet committed May 19, 2002
1 parent b7c2c08 commit 6fb964c
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 8 deletions.
2 changes: 2 additions & 0 deletions CHANGES
@@ -1,5 +1,7 @@
CHANGES IN FLTK 1.1.0rc3

- Documentation updates.
- OS/2 build fixes from Alexander Mai.
- Now use strlcat() instead of strncat() which could
cause buffer overflows.
- Now use of strlcpy() instead of strncpy() to simplify
Expand Down
15 changes: 12 additions & 3 deletions 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.66 2002/05/16 12:47:42 easysw Exp $"
dnl "$Id: configure.in,v 1.33.2.31.2.67 2002/05/19 17:44:56 easysw Exp $"
dnl
dnl Configuration script for the Fast Light Tool Kit (FLTK).
dnl
Expand Down Expand Up @@ -130,7 +130,16 @@ if test x$enable_shared = xyes; then
DSOLINK="-Wl,-rpath,$libdir"
fi
;;
IRIX* | OSF1*)
IRIX*)
DSONAME="libfltk.so.$FL_API_VERSION"
FLDSONAME="libfltk_forms.so.$FL_API_VERSION"
GLDSONAME="libfltk_gl.so.$FL_API_VERSION"
DSOCOMMAND="\$(CXX) -Wl,-soname,\$@,-set_version,sgi1.1 \$(LDLIBS) -shared $DEBUGFLAG -o"
if test "$libdir" != "/usr/lib" - a "$libdir" != "/usr/lib32"; then
DSOLINK="-Wl,-rpath,$libdir"
fi
;;
OSF1*)
DSONAME="libfltk.so.$FL_API_VERSION"
FLDSONAME="libfltk_forms.so.$FL_API_VERSION"
GLDSONAME="libfltk_gl.so.$FL_API_VERSION"
Expand Down Expand Up @@ -735,5 +744,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.66 2002/05/16 12:47:42 easysw Exp $".
dnl End of "$Id: configure.in,v 1.33.2.31.2.67 2002/05/19 17:44:56 easysw Exp $".
dnl
5 changes: 3 additions & 2 deletions documentation/Makefile
@@ -1,5 +1,5 @@
#
# "$Id: Makefile,v 1.9.2.10.2.15 2002/05/01 00:55:45 easysw Exp $"
# "$Id: Makefile,v 1.9.2.10.2.16 2002/05/19 17:44:56 easysw Exp $"
#
# Documentation makefile for the Fast Light Tool Kit (FLTK).
#
Expand Down Expand Up @@ -114,6 +114,7 @@ HTMLFILES = \
Fl_Scrollbar.html \
Fl_Secret_Input.html \
Fl_Select_Browser.html \
Fl_Shared_Image.html \
Fl_Single_Window.html \
Fl_Slider.html \
Fl_Tabs.html \
Expand Down Expand Up @@ -273,5 +274,5 @@ fltk.pdf: $(HTMLFILES) $(IMAGEFILES)
$(HTMLDOC) --verbose --batch fltk.book $(MEDIA) -f fltk.pdf

#
# End of "$Id: Makefile,v 1.9.2.10.2.15 2002/05/01 00:55:45 easysw Exp $".
# End of "$Id: Makefile,v 1.9.2.10.2.16 2002/05/19 17:44:56 easysw Exp $".
#
6 changes: 3 additions & 3 deletions src/flstring.h
@@ -1,5 +1,5 @@
/*
* "$Id: flstring.h,v 1.1.2.6 2002/05/16 12:47:43 easysw Exp $"
* "$Id: flstring.h,v 1.1.2.7 2002/05/19 17:44:56 easysw Exp $"
*
* Common string header file for the Fast Light Tool Kit (FLTK).
*
Expand Down Expand Up @@ -42,7 +42,7 @@

# ifdef index
# undef index
# endif // index
# endif /* index */

# if defined(WIN32) && !defined(__CYGWIN__)
# define strcasecmp(s,t) stricmp((s), (t))
Expand Down Expand Up @@ -87,5 +87,5 @@ extern size_t fl_strlcpy(char *, const char *, size_t);
#endif /* !flstring_h */

/*
* End of "$Id: flstring.h,v 1.1.2.6 2002/05/16 12:47:43 easysw Exp $".
* End of "$Id: flstring.h,v 1.1.2.7 2002/05/19 17:44:56 easysw Exp $".
*/

0 comments on commit 6fb964c

Please sign in to comment.