gre-ilya/fltk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Better MingW handling.

Browse Source 
Convert C++ comments to C comments in filename.H, which is included
from some C files.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2321 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet 2002-06-26 12:03:28 +00:00
parent e9f34465e0
commit 1be610c970
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
FL/filename.H
View File

@ -1,5 +1,5 @@
/*
* "$Id: filename.H,v 1.11.2.4.2.8 2002/06/24 15:22:57 easysw Exp $"
* "$Id: filename.H,v 1.11.2.4.2.9 2002/06/26 12:03:28 easysw Exp $"
*
* Filename header file for the Fast Light Tool Kit (FLTK).
*
@ -96,7 +96,10 @@ FL_EXPORT int fl_filename_list(const char *d, struct dirent ***list,
Fl_File_Sort_F *sort = fl_numericsort);
# endif /* __cplusplus */
// FLTK 1.0.x compatibility definitions...
/*
* FLTK 1.0.x compatibility definitions...
*/
# ifdef FLTK_1_0_COMPAT
# define filename_absolute fl_filename_absolute
# define filename_expand fl_filename_expand
@ -107,11 +110,11 @@ FL_EXPORT int fl_filename_list(const char *d, struct dirent ***list,
# define filename_name fl_filename_name
# define filename_relative fl_filename_relative
# define numericsort fl_numericsort
# endif // FLTK_1_0_COMPAT
# endif /* FLTK_1_0_COMPAT */
#endif /* FL_FILENAME_H */
/*
* End of "$Id: filename.H,v 1.11.2.4.2.8 2002/06/24 15:22:57 easysw Exp $".
* End of "$Id: filename.H,v 1.11.2.4.2.9 2002/06/26 12:03:28 easysw Exp $".
*/

10
configure.in
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.2.31.2.74 2002/06/25 13:36:27 easysw Exp $"
dnl "$Id: configure.in,v 1.33.2.31.2.75 2002/06/26 12:03:27 easysw Exp $"
dnl
dnl Configuration script for the Fast Light Tool Kit (FLTK).
dnl
@ -47,9 +47,13 @@ AC_SUBST(FL_API_VERSION)
dnl Get the operating system and version number...
uname=`uname`
uversion=`uname -r | sed -e '1,$s/[[^0-9]]//g'`
if test $uname = IRIX64; then
if test x$uname = xIRIX64; then
uname="IRIX"
fi
if test x$uname = x; then
# MingW doesn't provide any output when uname is run, even with "-s"...
uname="CYGWIN"
fi
dnl Don't automatically add "-g" to compiler options...
CFLAGS="${CFLAGS:=}"
@ -748,5 +752,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.74 2002/06/25 13:36:27 easysw Exp $".
dnl End of "$Id: configure.in,v 1.33.2.31.2.75 2002/06/26 12:03:27 easysw Exp $".
dnl

6
makefiles/makeinclude.mingw
View File

@ -1,5 +1,5 @@
#
# "$Id: makeinclude.mingw,v 1.1.2.3.2.7 2002/06/25 13:36:27 easysw Exp $"
# "$Id: makeinclude.mingw,v 1.1.2.3.2.8 2002/06/26 12:03:28 easysw Exp $"
#
# Make include file for the Fast Light Tool Kit (FLTK).
#
@ -57,7 +57,7 @@ srcdir = .
CXX = g++
CC = gcc
MAKEDEPEND = $(CXX) -M
POSTBUILD = rem
POSTBUILD = :
# flags for C++ compiler:
CFLAGS = -Wall -O2 -DWIN32
@ -108,5 +108,5 @@ THREADS =threads
$(CXX) -I.. $(CXXFLAGS) $< -c
#
# End of "$Id: makeinclude.mingw,v 1.1.2.3.2.7 2002/06/25 13:36:27 easysw Exp $".
# End of "$Id: makeinclude.mingw,v 1.1.2.3.2.8 2002/06/26 12:03:28 easysw Exp $".
#