From 96d4075b520d61ee5414f282b177cee4b55b3a77 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Tue, 26 Mar 2002 00:05:18 +0000 Subject: OS/2 update from Alexander Mai. Add $(EXEEXT) to test program makefile dependencies on FLUID... git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2035 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- makefiles/config.os2x | 403 ++++++++++++++++++++++++--------------------- makefiles/makeinclude.os2x | 223 +++++++++++++------------ test/Makefile | 26 +-- 3 files changed, 352 insertions(+), 300 deletions(-) diff --git a/makefiles/config.os2x b/makefiles/config.os2x index 5c31357e6..3ff22de6f 100644 --- a/makefiles/config.os2x +++ b/makefiles/config.os2x @@ -1,184 +1,219 @@ -/* - * "$Id: config.os2x,v 1.1.2.4.2.2 2001/10/19 14:04:08 easysw Exp $" - * - * 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@fltk.org". - */ - -/* - * Where to find the documentation files... - */ - -#define FLTK_DOCDIR "C:/FLTK/DOC" - - -/* - * 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 0 - -/* - * 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 1 - -/* - * 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 (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 1 -#define HAVE_SNPRINTF 1 -#define HAVE_VSPRINTF 1 - -/* - * String functions... - */ - -#define HAVE_STRCASECMP 1 - -/* - * HAVE_SYS_SELECT_H: - * - * Whether or not select() call has its own header file. - */ - -#define HAVE_SYS_SELECT_H 1 - -/* - * HAVE_POLL: - * - * Use poll() if we don't have select(). - */ - -#define HAVE_POLL 0 - -/* - * Do we have various image libraries? - */ - -#undef HAVE_LIBPNG -#undef HAVE_LIBZ -#undef HAVE_LIBJPEG - -/* - * Do we have the png_xyz() functions? - */ - -#undef HAVE_PNG_GET_VALID -#undef HAVE_PNG_SET_TRNS_TO_ALPHA -#undef HAVE_PNG_READ_DESTROY - - -/* - * End of "$Id: config.os2x,v 1.1.2.4.2.2 2001/10/19 14:04:08 easysw Exp $". - */ +/* config.h. Generated automatically by configure. */ +/* + * "$Id: config.os2x,v 1.1.2.4.2.3 2002/03/26 00:05:18 easysw Exp $" + * + * Configuration file for the Fast Light Tool Kit (FLTK). + * @configure_input@ + * + * Copyright 1998-2002 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". + */ + +/* + * Where to find the documentation files... + */ + +#define FLTK_DOCDIR "/usr/local/share/doc/fltk" + + +/* + * 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 0 + +/* + * HAVE_GL_GLU_H: + * + * Do you have the OpenGL Utility Library header file? + * (many broken Mesa RPMs do not...) + */ + +#define HAVE_GL_GLU_H 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 + +/* + * USE_XFT + * + * Use the new Xft library to draw anti-aliased text. + */ + +#define USE_XFT 0 + +/* + * HAVE_XDBE: + * + * Do we have the X double-buffer extension? + */ + +#define HAVE_XDBE 1 + +/* + * USE_XDBE: + * + * Actually try to use the double-buffer extension? + */ + +#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 (used only by fl_file_chooser and scandir). + */ + +#define HAVE_DIRENT_H 1 +/* #undef HAVE_SYS_NDIR_H */ +/* #undef HAVE_SYS_DIR_H */ +/* #undef HAVE_NDIR_H */ +/* #undef HAVE_SCANDIR */ + +/* + * Possibly missing sprintf-style functions: + */ + +#define HAVE_VSNPRINTF 1 +#define HAVE_SNPRINTF 1 +#define HAVE_VSPRINTF 1 + +/* + * String functions and headers... + */ + +#define HAVE_STRINGS_H 1 +/* #undef HAVE_STRCASECMP */ + +/* + * HAVE_SYS_SELECT_H: + * + * Whether or not select() call has its own header file. + */ + +#define HAVE_SYS_SELECT_H 1 + +/* + * HAVE_SYS_STDTYPES_H: + * + * Whether or not we have the header file. + */ + +/* #undef HAVE_SYS_STDTYPES_H */ + +/* + * USE_POLL: + * + * Use the poll() call provided on Linux and Irix instead of select() + */ + +#define USE_POLL 0 + +/* + * Do we have various image libraries? + */ + +#define HAVE_LIBPNG 1 +#define HAVE_LIBZ 1 +#define HAVE_LIBJPEG 1 + +/* + * Do we have the png_xyz() functions? + */ + +#define HAVE_PNG_GET_VALID 1 +/* #undef HAVE_PNG_SET_TRNS_TO_ALPHA */ +#define HAVE_PNG_READ_DESTROY 1 + + +/* + * Do we have POSIX threading? + */ + +/* #undef HAVE_PTHREAD */ +/* #undef HAVE_PTHREAD_H */ + + +/* + * End of "$Id: config.os2x,v 1.1.2.4.2.3 2002/03/26 00:05:18 easysw Exp $". + */ diff --git a/makefiles/makeinclude.os2x b/makefiles/makeinclude.os2x index 1ef60c81d..9bf865ab7 100644 --- a/makefiles/makeinclude.os2x +++ b/makefiles/makeinclude.os2x @@ -1,103 +1,120 @@ -# -# "$Id: makeinclude.os2x,v 1.1.2.4.2.4 2001/12/21 18:16:50 easysw Exp $" -# -# Make include file for the Fast Light Tool Kit (FLTK). -# Generated automatically from makeinclude.in by configure. -# -# 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@fltk.org". -# - -prefix =/usr/local -exec_prefix =${prefix} -bindir =${exec_prefix}/bin -datadir =${prefix}/share -includedir =${prefix}/include -libdir =${exec_prefix}/lib -mandir =${prefix}/man -srcdir =. - -# programs we use... -HTMLDOC =htmldoc -NROFF =nroff -RM =rm - -# compiler names: -CXX =gcc.exe -CC =gcc.exe -MAKEDEPEND =$(CXX) -M -POSTBUILD =echo - -# flags for C++ compiler: -CFLAGS =-Wall -O4 -mpentium -Zmt -fno-exceptions -CXXFLAGS =-Wall -O4 -mpentium -Zmt -fno-exceptions -LDFLAGS =-s -Zexe -Zmt -Zcrtdll -Zbsd-signals -Zbin-files -fno-exceptions - -# program to make the archive: -LIBNAME =../lib/fltk.a -GLLIBNAME =../lib/fltk_gl.a -LIBCOMMAND =ar cr -RANLIB =ar.exe s -DSONAME = -DSOCOMMAND =echo - -# libraries to link with: -LDLIBS =-lX11 -lXext -lsocket -GLDLIBS =-lX11 -lXext -lsocket -LINKFLTK =-L../lib -lfltk -LINKFLTKGL =-L../lib -lfltk_gl -IMAGELIBS = - -# Man page extensions... -CAT1EXT =1 -CAT3EXT =3 - -# Be quiet when building... -.SILENT: - -# Build commands and filename extensions... -.SUFFIXES: .0 .1 .3 .c .cxx .h .fl .man .o .z - -.cxx: - echo Compiling and linking $@... - $(CXX) -I.. $(CXXFLAGS) $< $(LINKFLTK) $(LDLIBS) -o $@ - -.c.o: - echo Compiling $@... - $(CC) -I.. $(CFLAGS) -c $< - -.cxx.o: - echo Compiling $@... - $(CXX) -I.. $(CXXFLAGS) -c $< - -.man.0 .man.1 .man.3: - echo Formatting $<... - rm -f $@ - $(NROFF) -man $< >$@ - -.man.z: - echo Formatting $<... - rm -f $@ t.z - $(NROFF) -man $< >t - pack -f t - mv t.z $@ - -# -# End of "$Id: makeinclude.os2x,v 1.1.2.4.2.4 2001/12/21 18:16:50 easysw Exp $". -# +# +# "$Id: makeinclude.os2x,v 1.1.2.4.2.5 2002/03/26 00:05:18 easysw Exp $" +# +# Make include file for the Fast Light Tool Kit (FLTK). +# Generated automatically from makeinclude.in by configure. +# +# Copyright 1998-2002 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". +# + +prefix =/usr/local +exec_prefix =${prefix} +bindir =${exec_prefix}/bin +datadir =${prefix}/share +includedir =${prefix}/include +libdir =${exec_prefix}/lib +mandir =${prefix}/man +srcdir =./. +VPATH =./. + +# programs we use... +HTMLDOC =htmldoc.exe +NROFF =nroff +RM =rm -f + +# compiler names: +CXX =gcc.exe +CC =gcc.exe +MAKEDEPEND =$(CXX) -M + +# flags for C++ compiler: +OPTIM = -O2 -Wall -fno-exceptions +CFLAGS =$(OPTIM) -O4 -mpentium -Zmt +CXXFLAGS =$(OPTIM) -O4 -mpentium -Zmt + +# program to make the archive: +LIBNAME =../lib/libfltk.a +FLLIBNAME =../lib/libfltk_forms.a +GLLIBNAME = +LIBCOMMAND =ar.exe cr +RANLIB =ar.exe s +DSONAME = +FLDSONAME = +GLDSONAME = +DSOCOMMAND =echo + +# libraries to link with: +LDLIBS = -s -Zmt -Zcrtdll -Zbsd-signals -lXext -lX11 -lsocket $(LDFLAGS_MIPSPRO) +GLDLIBS = -s -Zmt -Zcrtdll -Zbsd-signals -lXext -lX11 -lsocket -lshm $(LDFLAGS_MIPSPRO) +LINKFLTK = ../lib/libfltk.a +LINKFLTKGL = -L../lib +LINKFLTKFORMS = ../lib/libfltk_forms.a ../lib/libfltk.a +IMAGELIBS =-lpng -ljpeg -lz + +# Do we build the OpenGL demos? +GLDEMOS = + +# Do we build the threads demo? +THREADS = + +# The extension to use for executables... +EXEEXT =.exe + +# Possible steps after linking... +POSTBUILD =: + +# Man page extensions... +CAT1EXT =1 +CAT3EXT =3 + +# Be quiet when building... +.SILENT: + +# Build commands and filename extensions... +.SUFFIXES: .0 .1 .3 .c .cxx .h .fl .man .o .z $(EXEEXT) + +.o$(EXEEXT): + echo Linking $@... + $(CXX) -I.. $(CXXFLAGS) $< $(LINKFLTK) $(LDLIBS) -o $@ + $(POSTBUILD) $@ ../FL/mac.r + +.c.o: + echo Compiling $<... + $(CC) -I.. $(CFLAGS) -c $< + +.cxx.o: + echo Compiling $<... + $(CXX) -I.. $(CXXFLAGS) -c $< + +.man.0 .man.1 .man.3: + echo Formatting $<... + rm -f $@ + $(NROFF) -man $< >$@ + +.man.z: + echo Formatting $<... + rm -f $@ t.z + $(NROFF) -man $< >t + pack -f t + mv t.z $@ + +# +# End of "$Id: makeinclude.os2x,v 1.1.2.4.2.5 2002/03/26 00:05:18 easysw Exp $". +# diff --git a/test/Makefile b/test/Makefile index 5f279ac8e..de136ba87 100644 --- a/test/Makefile +++ b/test/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile,v 1.19.2.7.2.30 2002/03/25 21:39:01 easysw Exp $" +# "$Id: Makefile,v 1.19.2.7.2.31 2002/03/26 00:05:18 easysw Exp $" # # Test/example program makefile for the Fast Light Tool Kit (FLTK). # @@ -172,7 +172,7 @@ uninstall: # FLUID file rules .fl.cxx .fl.h: echo Generating $<... - ../fluid/fluid -c $< + ../fluid/fluid$(EXEEXT) -c $< # All demos depend on the FLTK library... $(ALL): ../lib/$(LIBNAME) @@ -222,7 +222,7 @@ editor$(EXEEXT): editor.o $(POSTBUILD) $@ ../FL/mac.r fast_slow$(EXEEXT): fast_slow.o -fast_slow.cxx: ../fluid/fluid +fast_slow.cxx: ../fluid/fluid$(EXEEXT) file_chooser$(EXEEXT): file_chooser.o echo Linking $@... @@ -248,7 +248,7 @@ iconize$(EXEEXT): iconize.o image$(EXEEXT): image.o inactive$(EXEEXT): inactive.o -inactive.cxx: ../fluid/fluid +inactive.cxx: ../fluid/fluid$(EXEEXT) input$(EXEEXT): input.o @@ -256,7 +256,7 @@ keyboard$(EXEEXT): keyboard_ui.o keyboard.o echo Linking $@... $(CXX) -I.. $(CXXFLAGS) keyboard.o keyboard_ui.o $(LINKFLTK) $(LDLIBS) -o $@ $(POSTBUILD) $@ ../FL/mac.r -keyboard_ui.o: keyboard_ui.h ../fluid/fluid +keyboard_ui.o: keyboard_ui.h ../fluid/fluid$(EXEEXT) label$(EXEEXT): label.o echo Linking $@... @@ -271,7 +271,7 @@ mandelbrot$(EXEEXT): mandelbrot_ui.o mandelbrot.o echo Linking $@... $(CXX) -I.. $(CXXFLAGS) mandelbrot.o mandelbrot_ui.o $(LINKFLTK) $(LDLIBS) -o $@ $(POSTBUILD) $@ ../FL/mac.r -mandelbrot_ui.o: mandelbrot_ui.h ../fluid/fluid +mandelbrot_ui.o: mandelbrot_ui.h ../fluid/fluid$(EXEEXT) menubar$(EXEEXT): menubar.o @@ -298,10 +298,10 @@ pixmap_browser$(EXEEXT): pixmap_browser.o $(POSTBUILD) $@ ../FL/mac.r radio$(EXEEXT): radio.o -radio.cxx: ../fluid/fluid +radio.cxx: ../fluid/fluid$(EXEEXT) resize$(EXEEXT): resize.o -resize.cxx: ../fluid/fluid +resize.cxx: ../fluid/fluid$(EXEEXT) resizebox$(EXEEXT): resizebox.o @@ -312,7 +312,7 @@ subwindow$(EXEEXT): subwindow.o symbols$(EXEEXT): symbols.o tabs$(EXEEXT): tabs.o -tabs.cxx: ../fluid/fluid +tabs.cxx: ../fluid/fluid$(EXEEXT) threads$(EXEEXT): threads.o @@ -321,7 +321,7 @@ tile$(EXEEXT): tile.o tiled_image$(EXEEXT): tiled_image.o valuators$(EXEEXT): valuators.o -valuators.cxx: ../fluid/fluid +valuators.cxx: ../fluid/fluid$(EXEEXT) # All OpenGL demos depend on the FLTK and FLTK_GL libraries... $(GLALL): ../lib/$(LIBNAME) ../lib/$(GLLIBNAME) @@ -334,7 +334,7 @@ CubeView$(EXEEXT): CubeMain.o CubeView.o CubeViewUI.o $(POSTBUILD) $@ ../FL/mac.r CubeMain.o: CubeViewUI.h CubeView.h CubeView.o: CubeView.h -CubeViewUI.o: CubeViewUI.h ../fluid/fluid +CubeViewUI.o: CubeViewUI.h ../fluid/fluid$(EXEEXT) cube$(EXEEXT): cube.o echo Linking $@... @@ -360,7 +360,7 @@ shiny$(EXEEXT): shiny_panel.o shiny.o echo Linking $@... $(CXX) -I.. $(CXXFLAGS) shiny.o shiny_panel.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) -o $@ $(POSTBUILD) $@ ../FL/mac.r -shiny_panel.o: shiny_panel.h ../fluid/fluid +shiny_panel.o: shiny_panel.h ../fluid/fluid$(EXEEXT) shape$(EXEEXT): shape.o echo Linking $@... @@ -369,5 +369,5 @@ shape$(EXEEXT): shape.o # -# End of "$Id: Makefile,v 1.19.2.7.2.30 2002/03/25 21:39:01 easysw Exp $". +# End of "$Id: Makefile,v 1.19.2.7.2.31 2002/03/26 00:05:18 easysw Exp $". # -- cgit v1.2.3