Only in flnx-0.16/FL: CVS diff -r -P -C 2 flnx-0.16/FL/Fl.H flnx-0.16-ecos/FL/Fl.H *** flnx-0.16/FL/Fl.H Sat Nov 18 08:05:42 2000 --- flnx-0.16-ecos/FL/Fl.H Sat Jul 14 21:04:32 2001 *************** *** 80,84 **** --- 80,86 ---- // things called by initialization: + #ifndef ECOS static FL_EXPORT void display(const char*); + #endif static FL_EXPORT int visual(int); static FL_EXPORT int gl_visual(int, int *alist=0); diff -r -P -C 2 flnx-0.16/FL/filename.H flnx-0.16-ecos/FL/filename.H *** flnx-0.16/FL/filename.H Sat Nov 18 08:05:42 2000 --- flnx-0.16-ecos/FL/filename.H Fri Jul 13 01:28:03 2001 *************** *** 59,62 **** --- 59,66 ---- #else + #ifdef ECOS + #undef bzero + #undef bcopy + #endif #include #include diff -r -P -C 2 flnx-0.16/FL/math.h flnx-0.16-ecos/FL/math.h *** flnx-0.16/FL/math.h Sat Nov 18 08:05:42 2000 --- flnx-0.16-ecos/FL/math.h Fri Jul 13 01:07:52 2001 *************** *** 28,31 **** --- 28,35 ---- #include + //ijsung + #ifndef M_PI + #define M_PI 3.14159265358979323846 + #endif #ifdef WIN32 diff -r -P -C 2 flnx-0.16/Makefile flnx-0.16-ecos/Makefile *** flnx-0.16/Makefile Sat Nov 18 08:05:41 2000 --- flnx-0.16-ecos/Makefile Thu Jul 12 21:42:47 2001 *************** *** 26,30 **** SHELL=/bin/sh ! DIRS = src fluid test all: makeinclude --- 26,31 ---- SHELL=/bin/sh ! #DIRS = src fluid test ! DIRS = src all: makeinclude diff -r -P -C 2 flnx-0.16/config.h flnx-0.16-ecos/config.h *** flnx-0.16/config.h Sat Nov 18 08:05:41 2000 --- flnx-0.16-ecos/config.h Sat Jul 14 20:36:30 2001 *************** *** 1,5 **** /* config.h. Generated automatically by configure. */ /* ! * "$Id: config.h,v 1.1.1.1 2000/11/18 00:05:41 jeffm Exp $" * * Configuration file for the Fast Light Tool Kit (FLTK). --- 1,5 ---- /* config.h. Generated automatically by configure. */ /* ! * "$Id: configh.in,v 1.1.1.1 2000/11/18 00:05:41 jeffm Exp $" * * Configuration file for the Fast Light Tool Kit (FLTK). *************** *** 122,130 **** */ ! #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 1 /* --- 122,130 ---- */ ! #define HAVE_DIRENT_H 0 #define HAVE_SYS_NDIR_H 0 #define HAVE_SYS_DIR_H 0 #define HAVE_NDIR_H 0 ! #define HAVE_SCANDIR 0 /* *************** *** 153,156 **** /* ! * End of "$Id: config.h,v 1.1.1.1 2000/11/18 00:05:41 jeffm Exp $". */ --- 153,174 ---- /* ! * End of "$Id: configh.in,v 1.1.1.1 2000/11/18 00:05:41 jeffm Exp $". */ + //#include + + #ifdef __cplusplus + extern "C" { + #endif + char *strdup(const char *s); + #include + int gettimeofday(struct timeval *tv, void *tz); + + #ifdef __cplusplus + } + #endif + + #define ECOS 1 + #define bcopy(s,d,n) memmove(d,s,n) + #define bzero(s,n) memset(s,0,n) + //#include + diff -r -P -C 2 flnx-0.16/config.log flnx-0.16-ecos/config.log *** flnx-0.16/config.log Thu Jan 1 08:00:00 1970 --- flnx-0.16-ecos/config.log Thu Jul 12 21:33:24 2001 *************** *** 0 **** --- 1,28 ---- + This file contains any messages produced by compilers while + running configure, to aid debugging if configure makes a mistake. + + configure:539: checking for ranlib + configure:635: checking for gcc + configure:748: checking whether the C compiler (gcc ) works + configure:764: gcc -o conftest conftest.c 1>&5 + configure:790: checking whether the C compiler (gcc ) is a cross-compiler + configure:795: checking whether we are using GNU C + configure:823: checking whether gcc accepts -g + configure:859: checking for c++ + configure:891: checking whether the C++ compiler (c++ ) works + configure:907: c++ -o conftest conftest.C 1>&5 + configure:933: checking whether the C++ compiler (c++ ) is a cross-compiler + configure:938: checking whether we are using GNU C++ + configure:966: checking whether c++ accepts -g + configure:999: checking whether byte ordering is bigendian + configure:1090: checking size of short + configure:1129: checking size of int + configure:1168: checking size of long + configure:1244: checking for dirent.h that defines DIR + configure:1282: checking for opendir in -ldir + configure:1365: checking how to run the C preprocessor + configure:1446: checking for sys/select.h + configure:1478: checking for scandir + configure:1533: checking for vsnprintf + configure:1588: checking for snprintf + configure:1645: checking for vsprintf diff -r -P -C 2 flnx-0.16/config.status flnx-0.16-ecos/config.status *** flnx-0.16/config.status Thu Jan 1 08:00:00 1970 --- flnx-0.16-ecos/config.status Thu Jul 12 21:33:24 2001 *************** *** 0 **** --- 1,270 ---- + #! /bin/sh + # Generated automatically by configure. + # Run this file to recreate the current configuration. + # This directory was configured as follows, + # on host biou2.Dorm13.NCTU.edu.tw: + # + # ./configure --with-microwin=/mnt/workshop/microwindows/current/src/ --libdir=/mnt/workshop/synth_test/install/lib --includedir=/mnt/workshop/synth_test/install/include/ --prefix=/mnt/workshop/microwindows/flnxecosbuild/ + # + # Compiler output produced by configure, useful for debugging + # configure, is in ./config.log if it exists. + + ac_cs_usage="Usage: ./config.status [--recheck] [--version] [--help]" + for ac_option + do + case "$ac_option" in + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) + echo "running ${CONFIG_SHELL-/bin/sh} ./configure --with-microwin=/mnt/workshop/microwindows/current/src/ --libdir=/mnt/workshop/synth_test/install/lib --includedir=/mnt/workshop/synth_test/install/include/ --prefix=/mnt/workshop/microwindows/flnxecosbuild/ --no-create --no-recursion" + exec ${CONFIG_SHELL-/bin/sh} ./configure --with-microwin=/mnt/workshop/microwindows/current/src/ --libdir=/mnt/workshop/synth_test/install/lib --includedir=/mnt/workshop/synth_test/install/include/ --prefix=/mnt/workshop/microwindows/flnxecosbuild/ --no-create --no-recursion ;; + -version | --version | --versio | --versi | --vers | --ver | --ve | --v) + echo "./config.status generated by autoconf version 2.13" + exit 0 ;; + -help | --help | --hel | --he | --h) + echo "$ac_cs_usage"; exit 0 ;; + *) echo "$ac_cs_usage"; exit 1 ;; + esac + done + + ac_given_srcdir=. + + trap 'rm -fr makeinclude config.h conftest*; exit 1' 1 2 15 + + # Protect against being on the right side of a sed subst in config.status. + sed 's/%@/@@/; s/@%/@@/; s/%g$/@g/; /@g$/s/[\\&%]/\\&/g; + s/@@/%@/; s/@@/@%/; s/@g$/%g/' > conftest.subs <<\CEOF + /^[ ]*VPATH[ ]*=[^:]*$/d + + s%@SHELL@%/bin/sh%g + s%@CFLAGS@% -O2 -Wall -DNANO_X -I/mnt/workshop/microwindows/current/src//include -DNANOXFOLDER='"/mnt/workshop/microwindows/current/src//bin"'%g + s%@CPPFLAGS@%%g + s%@CXXFLAGS@% -O2 -Wall -Wno-return-type -DNANO_X -I/mnt/workshop/microwindows/current/src//include -DNANOXFOLDER='"/mnt/workshop/microwindows/current/src//bin"'%g + s%@FFLAGS@%%g + s%@DEFS@%-DHAVE_CONFIG_H%g + s%@LDFLAGS@% -DNANO_X=1%g + s%@LIBS@%%g + s%@exec_prefix@%${prefix}%g + s%@prefix@%/mnt/workshop/microwindows/flnxecosbuild/%g + s%@program_transform_name@%s,x,x,%g + s%@bindir@%${exec_prefix}/bin%g + s%@sbindir@%${exec_prefix}/sbin%g + s%@libexecdir@%${exec_prefix}/libexec%g + s%@datadir@%${prefix}/share%g + s%@sysconfdir@%${prefix}/etc%g + s%@sharedstatedir@%${prefix}/com%g + s%@localstatedir@%${prefix}/var%g + s%@libdir@%/mnt/workshop/synth_test/install/lib%g + s%@includedir@%/mnt/workshop/synth_test/install/include/%g + s%@oldincludedir@%/usr/include%g + s%@infodir@%${prefix}/info%g + s%@mandir@%${prefix}/man%g + s%@RANLIB@%ranlib%g + s%@CC@%gcc%g + s%@CXX@%c++%g + s%@CPP@%gcc -E%g + s%@MICROWINFOLDER@%/mnt/workshop/microwindows/current/src/%g + s%@NANOX@%1%g + s%@MWLIBS@%-L/mnt/workshop/microwindows/current/src//lib -lnano-X -lmwengine -lmwdrivers -lmwfonts -ljpeg%g + s%@X_CFLAGS@%%g + s%@X_PRE_LIBS@%%g + s%@X_LIBS@%%g + s%@X_EXTRA_LIBS@%%g + s%@GLLIB@%%g + s%@DSONAME@%%g + s%@DSOCOMMAND@%echo%g + s%@LIBNAME@%libfltk.a%g + s%@LIBCOMMAND@%cr%g + s%@MAKEDEPEND@%$(CXX) -M%g + + CEOF + + # Split the substitutions into bite-sized pieces for seds with + # small command number limits, like on Digital OSF/1 and HP-UX. + ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script. + ac_file=1 # Number of current file. + ac_beg=1 # First line for current file. + ac_end=$ac_max_sed_cmds # Line after last line for current file. + ac_more_lines=: + ac_sed_cmds="" + while $ac_more_lines; do + if test $ac_beg -gt 1; then + sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file + else + sed "${ac_end}q" conftest.subs > conftest.s$ac_file + fi + if test ! -s conftest.s$ac_file; then + ac_more_lines=false + rm -f conftest.s$ac_file + else + if test -z "$ac_sed_cmds"; then + ac_sed_cmds="sed -f conftest.s$ac_file" + else + ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file" + fi + ac_file=`expr $ac_file + 1` + ac_beg=$ac_end + ac_end=`expr $ac_end + $ac_max_sed_cmds` + fi + done + if test -z "$ac_sed_cmds"; then + ac_sed_cmds=cat + fi + + CONFIG_FILES=${CONFIG_FILES-"makeinclude"} + for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then + # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". + case "$ac_file" in + *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` + ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; + *) ac_file_in="${ac_file}.in" ;; + esac + + # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories. + + # Remove last slash and all that follows it. Not all systems have dirname. + ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` + if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then + # The file is in a subdirectory. + test ! -d "$ac_dir" && mkdir "$ac_dir" + ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`" + # A "../" for each directory in $ac_dir_suffix. + ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'` + else + ac_dir_suffix= ac_dots= + fi + + case "$ac_given_srcdir" in + .) srcdir=. + if test -z "$ac_dots"; then top_srcdir=. + else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; + /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; + *) # Relative path. + srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" + top_srcdir="$ac_dots$ac_given_srcdir" ;; + esac + + + echo creating "$ac_file" + rm -f "$ac_file" + configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure." + case "$ac_file" in + *Makefile*) ac_comsub="1i\\ + # $configure_input" ;; + *) ac_comsub= ;; + esac + + ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` + sed -e "$ac_comsub + s%@configure_input@%$configure_input%g + s%@srcdir@%$srcdir%g + s%@top_srcdir@%$top_srcdir%g + " $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file + fi; done + rm -f conftest.s* + + # These sed commands are passed to sed as "A NAME B NAME C VALUE D", where + # NAME is the cpp macro being defined and VALUE is the value it is being given. + # + # ac_d sets the value in "#define NAME VALUE" lines. + ac_dA='s%^\([ ]*\)#\([ ]*define[ ][ ]*\)' + ac_dB='\([ ][ ]*\)[^ ]*%\1#\2' + ac_dC='\3' + ac_dD='%g' + # ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE". + ac_uA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' + ac_uB='\([ ]\)%\1#\2define\3' + ac_uC=' ' + ac_uD='\4%g' + # ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE". + ac_eA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' + ac_eB='$%\1#\2define\3' + ac_eC=' ' + ac_eD='%g' + + if test "${CONFIG_HEADERS+set}" != set; then + CONFIG_HEADERS="config.h:configh.in" + fi + for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then + # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". + case "$ac_file" in + *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` + ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; + *) ac_file_in="${ac_file}.in" ;; + esac + + echo creating $ac_file + + rm -f conftest.frag conftest.in conftest.out + ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` + cat $ac_file_inputs > conftest.in + + cat > conftest.frag < conftest.out + rm -f conftest.in + mv conftest.out conftest.in + + cat > conftest.frag < conftest.out + rm -f conftest.in + mv conftest.out conftest.in + + cat > conftest.frag < conftest.out + rm -f conftest.in + mv conftest.out conftest.in + + rm -f conftest.frag conftest.h + echo "/* $ac_file. Generated automatically by configure. */" > conftest.h + cat conftest.in >> conftest.h + rm -f conftest.in + if cmp -s $ac_file conftest.h 2>/dev/null; then + echo "$ac_file is unchanged" + rm -f conftest.h + else + # Remove last slash and all that follows it. Not all systems have dirname. + ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` + if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then + # The file is in a subdirectory. + test ! -d "$ac_dir" && mkdir "$ac_dir" + fi + rm -f $ac_file + mv conftest.h $ac_file + fi + fi; done + + + + exit 0 Binary files flnx-0.16/fluid/Fl_Function_Type.o and flnx-0.16-ecos/fluid/Fl_Function_Type.o differ Binary files flnx-0.16/fluid/Fl_Menu_Type.o and flnx-0.16-ecos/fluid/Fl_Menu_Type.o differ Binary files flnx-0.16/lib/libfltk.a and flnx-0.16-ecos/lib/libfltk.a differ diff -r -P -C 2 flnx-0.16/makeinclude flnx-0.16-ecos/makeinclude *** flnx-0.16/makeinclude Thu Jan 1 08:00:00 1970 --- flnx-0.16-ecos/makeinclude Fri Jul 13 01:57:21 2001 *************** *** 0 **** --- 1,60 ---- + # + # "$Id: makeinclude.in,v 1.1.1.1 2000/11/18 00:05:42 jeffm Exp $" + # + # Make include file for the Fast Light Tool Kit (FLTK). + # Generated automatically from makeinclude.in by configure. + # + # Copyright 1998-1999 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". + # + + # Looking for the microwin define? It is now in the config + # use --with-microwin=[path] + + prefix =/mnt/workshop/microwindows/flnxecosbuild/ + exec_prefix =${prefix} + bindir =${exec_prefix}/bin + includedir =/mnt/workshop/microwindows/flnxecosbuild/ + libdir =/mnt/workshop/microwindows/flnxecosbuild/ + srcdir =. + + # compiler names: + CXX =i686-pc-linux-gnu-g++ + CC =i686-pc-linux-gnu-gcc + MAKEDEPEND =$(CXX) -M + + + # flags for C++ compiler: + CFLAGS = -O2 -Wall -I/mnt/workshop/eCosBuilds/LinuxSynthElix/install/include -DNANO_X -I/mnt/workshop/microwindows/current/src//include -DNANOXFOLDER='"/mnt/workshop/microwindows/current/src//bin"' + CXXFLAGS = -O2 -Wall -I/mnt/workshop/eCosBuilds/LinuxSynthElix/install/include -Wno-return-type -DNANO_X -I/mnt/workshop/microwindows/current/src//include -DNANOXFOLDER='"/mnt/workshop/microwindows/current/src//bin"' + + # program to make the archive: + LIBNAME =libfltk.a + LIBCOMMAND =$(AR) cr + RANLIB =ranlib + DSONAME = + DSOCOMMAND =echo + + # libraries to link with: for normal + LDLIBS = -DNANO_X=1 -L/mnt/workshop/eCosBuilds/LinuxSynthElix/install/lib -L/mnt/workshop/microwindows/current/src//lib -lnano-X -lmwengine -lmwdrivers -lmwfonts -ljpeg -lm + GLDLIBS = -DNANO_X=1 -L/mnt/workshop/eCosBuilds/LinuxSynthElix/install/lib -L/mnt/workshop/microwindows/current/src//lib -lnano-X -lmwengine -lmwdrivers -lmwfonts -ljpeg -lm + + # + # End of "$Id: makeinclude.in,v 1.1.1.1 2000/11/18 00:05:42 jeffm Exp $". + # diff -r -P -C 2 flnx-0.16/makeinclude.ARM flnx-0.16-ecos/makeinclude.ARM *** flnx-0.16/makeinclude.ARM Thu Jan 1 08:00:00 1970 --- flnx-0.16-ecos/makeinclude.ARM Fri Jul 13 13:36:37 2001 *************** *** 0 **** --- 1,60 ---- + # + # "$Id: makeinclude.in,v 1.1.1.1 2000/11/18 00:05:42 jeffm Exp $" + # + # Make include file for the Fast Light Tool Kit (FLTK). + # Generated automatically from makeinclude.in by configure. + # + # Copyright 1998-1999 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". + # + + # Looking for the microwin define? It is now in the config + # use --with-microwin=[path] + + prefix =/mnt/workshop/microwindows/flnxecosbuild-arm/ + exec_prefix =${prefix} + bindir =${exec_prefix}/bin + includedir =/mnt/workshop/microwindows/flnxecosbuild-arm/ + libdir =/mnt/workshop/microwindows/flnxecosbuild-arm/ + srcdir =. + + # compiler names: + CXX =arm-elf-g++ + CC =arm-elf-gcc + MAKEDEPEND =$(CXX) -M + + + # flags for C++ compiler: + CFLAGS = -g -Wall -I/mnt/workshop/eCosBuilds/AssabetTouch/install/include -DNANO_X -I/mnt/workshop/microwindows/current/src//include -DNANOXFOLDER='"/mnt/workshop/microwindows/current/src//bin"' + CXXFLAGS = -g -Wall -I/mnt/workshop/eCosBuilds/AssabetTouch/install/include -Wno-return-type -DNANO_X -I/mnt/workshop/microwindows/current/src//include -DNANOXFOLDER='"/mnt/workshop/microwindows/current/src//bin"' + + # program to make the archive: + LIBNAME =libfltk.a + LIBCOMMAND =arm-elf-ar crs + RANLIB =arm-elf-ranlib + DSONAME = + DSOCOMMAND =echo + + # libraries to link with: for normal + LDLIBS = -DNANO_X=1 -L/mnt/workshop/eCosBuilds/LinuxSynthElix/install/lib -L/mnt/workshop/microwindows/current/src//lib -lnano-X -lmwengine -lmwdrivers -lmwfonts -ljpeg -lm + GLDLIBS = -DNANO_X=1 -L/mnt/workshop/eCosBuilds/LinuxSynthElix/install/lib -L/mnt/workshop/microwindows/current/src//lib -lnano-X -lmwengine -lmwdrivers -lmwfonts -ljpeg -lm + + # + # End of "$Id: makeinclude.in,v 1.1.1.1 2000/11/18 00:05:42 jeffm Exp $". + # diff -r -P -C 2 flnx-0.16/makeinclude.LINUX flnx-0.16-ecos/makeinclude.LINUX *** flnx-0.16/makeinclude.LINUX Thu Jan 1 08:00:00 1970 --- flnx-0.16-ecos/makeinclude.LINUX Fri Jul 13 01:57:21 2001 *************** *** 0 **** --- 1,60 ---- + # + # "$Id: makeinclude.in,v 1.1.1.1 2000/11/18 00:05:42 jeffm Exp $" + # + # Make include file for the Fast Light Tool Kit (FLTK). + # Generated automatically from makeinclude.in by configure. + # + # Copyright 1998-1999 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". + # + + # Looking for the microwin define? It is now in the config + # use --with-microwin=[path] + + prefix =/mnt/workshop/microwindows/flnxecosbuild/ + exec_prefix =${prefix} + bindir =${exec_prefix}/bin + includedir =/mnt/workshop/microwindows/flnxecosbuild/ + libdir =/mnt/workshop/microwindows/flnxecosbuild/ + srcdir =. + + # compiler names: + CXX =i686-pc-linux-gnu-g++ + CC =i686-pc-linux-gnu-gcc + MAKEDEPEND =$(CXX) -M + + + # flags for C++ compiler: + CFLAGS = -O2 -Wall -I/mnt/workshop/eCosBuilds/LinuxSynthElix/install/include -DNANO_X -I/mnt/workshop/microwindows/current/src//include -DNANOXFOLDER='"/mnt/workshop/microwindows/current/src//bin"' + CXXFLAGS = -O2 -Wall -I/mnt/workshop/eCosBuilds/LinuxSynthElix/install/include -Wno-return-type -DNANO_X -I/mnt/workshop/microwindows/current/src//include -DNANOXFOLDER='"/mnt/workshop/microwindows/current/src//bin"' + + # program to make the archive: + LIBNAME =libfltk.a + LIBCOMMAND =$(AR) cr + RANLIB =ranlib + DSONAME = + DSOCOMMAND =echo + + # libraries to link with: for normal + LDLIBS = -DNANO_X=1 -L/mnt/workshop/eCosBuilds/LinuxSynthElix/install/lib -L/mnt/workshop/microwindows/current/src//lib -lnano-X -lmwengine -lmwdrivers -lmwfonts -ljpeg -lm + GLDLIBS = -DNANO_X=1 -L/mnt/workshop/eCosBuilds/LinuxSynthElix/install/lib -L/mnt/workshop/microwindows/current/src//lib -lnano-X -lmwengine -lmwdrivers -lmwfonts -ljpeg -lm + + # + # End of "$Id: makeinclude.in,v 1.1.1.1 2000/11/18 00:05:42 jeffm Exp $". + # diff -r -P -C 2 flnx-0.16/shellscript flnx-0.16-ecos/shellscript *** flnx-0.16/shellscript Thu Jan 1 08:00:00 1970 --- flnx-0.16-ecos/shellscript Fri Jul 13 01:55:31 2001 *************** *** 0 **** --- 1,2 ---- + ./configure --with-microwin=/mnt/workshop/microwindows/current/src/ --libdir=/mnt/workshop/microwindws/flnxecosbuild --includedir=/mnt/workshop/microwindws/flnxecosbuild/ --prefix=/mnt/workshop/microwindows/flnxecosbuild/ + Only in flnx-0.16/src: CVS diff -r -P -C 2 flnx-0.16/src/Fl.cxx flnx-0.16-ecos/src/Fl.cxx *** flnx-0.16/src/Fl.cxx Sat Nov 18 08:05:44 2000 --- flnx-0.16-ecos/src/Fl.cxx Fri Jul 13 01:22:20 2001 *************** *** 161,165 **** --- 161,169 ---- #ifndef WIN32 + #ifdef ECOS + #include + #else #include + #endif #endif diff -r -P -C 2 flnx-0.16/src/Fl_Animator.cxx flnx-0.16-ecos/src/Fl_Animator.cxx *** flnx-0.16/src/Fl_Animator.cxx Sat Jan 6 06:53:20 2001 --- flnx-0.16-ecos/src/Fl_Animator.cxx Sat Jul 14 21:32:05 2001 *************** *** 1,2 **** --- 1,9 ---- + #include + + #ifdef ECOS + #include + #include + #endif + #include #include *************** *** 33,37 **** { ! int x, y; _image = new Fl_Pixmap(image); --- 40,44 ---- { ! // int x, y; _image = new Fl_Pixmap(image); *************** *** 45,49 **** _interval = ((double) interval / 1000); ! printf("The interval is %f\n", _interval); _curframe = 0; --- 52,57 ---- _interval = ((double) interval / 1000); ! ! diag_printf("The interval is %f\n", _interval); _curframe = 0; *************** *** 68,72 **** return; ! printf("FL_ANIMATOR: Start playing with interval %f\n", _interval); _playing = true; --- 76,80 ---- return; ! diag_printf("FL_ANIMATOR: Start playing with interval %f\n", _interval); _playing = true; *************** *** 79,83 **** return; ! printf("FL_ANIMATOR: Stopping the animation!\n"); _playing = false; --- 87,91 ---- return; ! diag_printf("FL_ANIMATOR: Stopping the animation!\n"); _playing = false; diff -r -P -C 2 flnx-0.16/src/Fl_Chart.cxx flnx-0.16-ecos/src/Fl_Chart.cxx *** flnx-0.16/src/Fl_Chart.cxx Sat Nov 18 08:05:44 2000 --- flnx-0.16-ecos/src/Fl_Chart.cxx Sun Jul 15 02:18:01 2001 *************** *** 30,34 **** #include #include - #define ARCINC (2.0*M_PI/360.0) --- 30,33 ---- diff -r -P -C 2 flnx-0.16/src/Fl_Clock.cxx flnx-0.16-ecos/src/Fl_Clock.cxx *** flnx-0.16/src/Fl_Clock.cxx Sat Nov 18 08:05:44 2000 --- flnx-0.16-ecos/src/Fl_Clock.cxx Fri Jul 13 01:23:58 2001 *************** *** 30,34 **** #include #ifndef WIN32 ! # include #endif /* !WIN32 */ --- 30,38 ---- #include #ifndef WIN32 ! #ifdef ECOS ! #include ! #else ! #include ! #endif #endif /* !WIN32 */ diff -r -P -C 2 flnx-0.16/src/Fl_Color_Chooser.cxx flnx-0.16-ecos/src/Fl_Color_Chooser.cxx *** flnx-0.16/src/Fl_Color_Chooser.cxx Sat Nov 18 08:05:44 2000 --- flnx-0.16-ecos/src/Fl_Color_Chooser.cxx Sun Jul 15 02:22:57 2001 *************** *** 83,87 **** enum {M_RGB, M_BYTE, M_HEX, M_HSV}; // modes ! static Fl_Menu_Item mode_menu[] = { {"rgb"}, {"byte"}, --- 83,87 ---- enum {M_RGB, M_BYTE, M_HEX, M_HSV}; // modes ! static const Fl_Menu_Item mode_menu[] = { {"rgb"}, {"byte"}, diff -r -P -C 2 flnx-0.16/src/Fl_Input.cxx flnx-0.16-ecos/src/Fl_Input.cxx *** flnx-0.16/src/Fl_Input.cxx Sat Nov 18 08:05:44 2000 --- flnx-0.16-ecos/src/Fl_Input.cxx Mon Jul 16 04:50:40 2001 *************** *** 129,133 **** static unsigned char modifier_state = 0; ! static uchar shift_map[128] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07, 0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, --- 129,133 ---- static unsigned char modifier_state = 0; ! static const uchar shift_map[128] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07, 0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, diff -r -P -C 2 flnx-0.16/src/Fl_Menu_add.cxx flnx-0.16-ecos/src/Fl_Menu_add.cxx *** flnx-0.16/src/Fl_Menu_add.cxx Sat Nov 18 08:05:44 2000 --- flnx-0.16-ecos/src/Fl_Menu_add.cxx Fri Jul 13 00:53:22 2001 *************** *** 38,42 **** #include #include ! // If the array is this, we will double-reallocate as necessary: static Fl_Menu_Item* local_array = 0; --- 38,42 ---- #include #include ! extern "C" char *strdup(const char *s); // If the array is this, we will double-reallocate as necessary: static Fl_Menu_Item* local_array = 0; diff -r -P -C 2 flnx-0.16/src/Fl_arg.cxx flnx-0.16-ecos/src/Fl_arg.cxx *** flnx-0.16/src/Fl_arg.cxx Sat Nov 18 08:05:44 2000 --- flnx-0.16-ecos/src/Fl_arg.cxx Sat Jul 14 21:11:51 2001 *************** *** 100,105 **** --- 100,107 ---- #ifndef WIN32 + #ifndef ECOS } else if (match(s, "display")) { Fl::display(v); + #endif #endif diff -r -P -C 2 flnx-0.16/src/Fl_display.cxx flnx-0.16-ecos/src/Fl_display.cxx *** flnx-0.16/src/Fl_display.cxx Sat Nov 18 08:05:44 2000 --- flnx-0.16-ecos/src/Fl_display.cxx Sat Jul 14 21:12:23 2001 *************** *** 27,34 **** // Using setenv makes programs that are exec'd use the same display. #include #include #include - void Fl::display(const char *d) { char *e = new char[strlen(d)+13]; --- 27,36 ---- // Using setenv makes programs that are exec'd use the same display. + #include + #ifndef ECOS + #include #include #include void Fl::display(const char *d) { char *e = new char[strlen(d)+13]; *************** *** 38,41 **** --- 40,45 ---- putenv(e); } + + #endif // diff -r -P -C 2 flnx-0.16/src/Fl_x.cxx flnx-0.16-ecos/src/Fl_x.cxx *** flnx-0.16/src/Fl_x.cxx Fri Dec 8 01:20:44 2000 --- flnx-0.16-ecos/src/Fl_x.cxx Sat Jul 14 21:01:30 2001 *************** *** 45,50 **** #include #include - #include #define CONSOLIDATE_MOTION 1 /**** Define this if your keyboard lacks a backspace key... ****/ --- 45,57 ---- #include #include + #ifndef ECOS + #include + #else + extern "C" int select(int n, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, struct timeval *timeout); + #include + #include + #include + #endif #define CONSOLIDATE_MOTION 1 /**** Define this if your keyboard lacks a backspace key... ****/ *************** *** 57,60 **** --- 64,72 ---- #if HAVE_POLL + /* sanity check */ + #ifdef ECOS + #error "eCos shouldn't have poll" + #endif + #include static pollfd *pollfds = 0; *************** *** 83,86 **** --- 95,100 ---- /* I think I have everything mapped, but check me for accuracy */ + /* IJ Sung: this is a constant static array: no need for duplicating it to pthread private data */ + static struct { *************** *** 88,92 **** unsigned short value; } ! keymap_array[] = { { --- 102,106 ---- unsigned short value; } ! const keymap_array[] = { { *************** *** 312,316 **** #endif ! int update = 0; double --- 326,330 ---- #endif ! static int update = 0; double *************** *** 362,365 **** --- 376,380 ---- int d = 0; if ((d = GrOpen ()) < 0) { + #ifndef ECOS char buffer[256]; /* run server and window manager */ *************** *** 371,374 **** --- 386,393 ---- exit (1); } + #else + diag_printf ("Cannot open Nano-X graphics, exit.\n"); + pthread_exit((void *)NULL); + #endif } diff -r -P -C 2 flnx-0.16/src/Makefile flnx-0.16-ecos/src/Makefile *** flnx-0.16/src/Makefile Sat Jan 6 06:52:52 2001 --- flnx-0.16-ecos/src/Makefile Sun Jul 15 02:32:58 2001 *************** *** 42,48 **** Fl_Dial.cxx \ Fl_Double_Window.cxx \ - Fl_Gl_Choice.cxx \ - Fl_Gl_Overlay.cxx \ - Fl_Gl_Window.cxx \ Fl_Group.cxx \ Fl_Image.cxx \ --- 42,45 ---- *************** *** 93,103 **** Fl_visual.cxx \ Fl_x.cxx \ - filename_absolute.cxx \ - filename_expand.cxx \ - filename_ext.cxx \ - filename_isdir.cxx \ - filename_list.cxx \ - filename_match.cxx \ - filename_setext.cxx \ fl_arc.cxx \ fl_arci.cxx \ --- 90,93 ---- *************** *** 112,116 **** fl_draw_pixmap.cxx \ fl_engraved_label.cxx \ - fl_file_chooser.cxx \ fl_font.cxx \ fl_labeltype.cxx \ --- 102,105 ---- *************** *** 134,144 **** forms_fselect.cxx \ forms_pixmap.cxx \ ! forms_timer.cxx \ ! gl_draw.cxx \ ! gl_start.cxx \ ! glut_compatability.cxx \ ! glut_font.cxx ! CFILES = fl_call_main.c scandir.c numericsort.c vsnprintf.c CLEAN = --- 123,145 ---- forms_fselect.cxx \ forms_pixmap.cxx \ ! forms_timer.cxx ! # Fl_Gl_Choice.cxx \ ! # Fl_Gl_Overlay.cxx \ ! # Fl_Gl_Window.cxx \ ! # gl_draw.cxx \ ! # gl_start.cxx \ ! # glut_compatability.cxx \ ! # glut_font.cxx ! # filename_absolute.cxx \ ! # filename_expand.cxx \ ! # filename_ext.cxx \ ! # filename_isdir.cxx \ ! # filename_list.cxx \ ! # filename_match.cxx \ ! # filename_setext.cxx \ ! # fl_file_chooser.cxx \ ! #CFILES = fl_call_main.c scandir.c numericsort.c vsnprintf.c gettimeofday.c ! CFILES = fl_call_main.c vsnprintf.c gettimeofday.c CLEAN = diff -r -P -C 2 flnx-0.16/src/fl_font.cxx flnx-0.16-ecos/src/fl_font.cxx *** flnx-0.16/src/fl_font.cxx Sat Nov 18 08:05:45 2000 --- flnx-0.16-ecos/src/fl_font.cxx Fri Jul 13 01:12:05 2001 *************** *** 100,104 **** cache[n]->fontid = curfont; cache[n]->age = 0; - bcopy(widths, cache[n]->widths, 256); memcpy(&cache[n]->fi,fi,sizeof(GR_FONT_INFO)); --- 100,103 ---- diff -r -P -C 2 flnx-0.16/src/forms_timer.cxx flnx-0.16-ecos/src/forms_timer.cxx *** flnx-0.16/src/forms_timer.cxx Sat Nov 18 08:05:45 2000 --- flnx-0.16-ecos/src/forms_timer.cxx Fri Jul 13 01:32:28 2001 *************** *** 35,40 **** --- 35,44 ---- # include #else + #ifdef ECOS + #include + #else # include #endif + #endif #include *************** *** 49,54 **** --- 53,64 ---- #else struct timeval tp; + + #ifndef ECOS struct timezone tzp; gettimeofday(&tp, &tzp); + #else + gettimeofday(&tp,NULL); + #endif + *sec = tp.tv_sec; *usec = tp.tv_usec; diff -r -P -C 2 flnx-0.16/src/gettimeofday.c flnx-0.16-ecos/src/gettimeofday.c *** flnx-0.16/src/gettimeofday.c Thu Jan 1 08:00:00 1970 --- flnx-0.16-ecos/src/gettimeofday.c Fri Jul 13 01:39:19 2001 *************** *** 0 **** --- 1,12 ---- + #include + #include + int + gettimeofday(struct timeval *tv, void *tz) + { + cyg_tick_count_t cur_time; + cur_time = cyg_current_time(); + tv->tv_sec = cur_time / 100; + tv->tv_usec = (cur_time % 100) * 10000; + return 0; + } + diff -r -P -C 2 flnx-0.16/src/numericsort.c flnx-0.16-ecos/src/numericsort.c *** flnx-0.16/src/numericsort.c Sat Nov 18 08:05:45 2000 --- flnx-0.16-ecos/src/numericsort.c Fri Jul 13 13:39:41 2001 *************** *** 30,34 **** --- 30,37 ---- #include #include + + #ifndef ECOS #include + #endif #ifdef WIN32