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
This commit is contained in:
Michael R Sweet 2002-03-26 00:05:18 +00:00
parent 887fe14a2b
commit 96d4075b52
3 changed files with 352 additions and 300 deletions

View File

@ -1,9 +1,11 @@
/* config.h. Generated automatically by configure. */
/*
* "$Id: config.os2x,v 1.1.2.4.2.2 2001/10/19 14:04:08 easysw Exp $"
* "$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-2001 by Bill Spitzak and others.
* 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
@ -20,14 +22,14 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA.
*
* Please report all bugs and problems to "FLTK-bugs@fltk.org".
* Please report all bugs and problems to "fltk-bugs@fltk.org".
*/
/*
* Where to find the documentation files...
*/
#define FLTK_DOCDIR "C:/FLTK/DOC"
#define FLTK_DOCDIR "/usr/local/share/doc/fltk"
/*
@ -55,6 +57,15 @@
#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:
*
@ -64,6 +75,14 @@
#define USE_COLORMAP 1
/*
* USE_XFT
*
* Use the new Xft library to draw anti-aliased text.
*/
#define USE_XFT 0
/*
* HAVE_XDBE:
*
@ -75,8 +94,7 @@
/*
* USE_XDBE:
*
* Actually try to use the double-buffer extension? Set this to zero
* disable use of XDBE without breaking the list_visuals program.
* Actually try to use the double-buffer extension?
*/
#define USE_XDBE HAVE_XDBE
@ -118,7 +136,7 @@
#define U16 unsigned short
#define U32 unsigned
#undef U64
/* #undef U64 */
/*
* HAVE_DIRENT_H, HAVE_SYS_NDIR_H, HAVE_SYS_DIR_H, HAVE_NDIR_H, HAVE_SCANDIR:
@ -127,10 +145,10 @@
*/
#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
/* #undef HAVE_SYS_NDIR_H */
/* #undef HAVE_SYS_DIR_H */
/* #undef HAVE_NDIR_H */
/* #undef HAVE_SCANDIR */
/*
* Possibly missing sprintf-style functions:
@ -141,10 +159,11 @@
#define HAVE_VSPRINTF 1
/*
* String functions...
* String functions and headers...
*/
#define HAVE_STRCASECMP 1
#define HAVE_STRINGS_H 1
/* #undef HAVE_STRCASECMP */
/*
* HAVE_SYS_SELECT_H:
@ -155,30 +174,46 @@
#define HAVE_SYS_SELECT_H 1
/*
* HAVE_POLL:
* HAVE_SYS_STDTYPES_H:
*
* Use poll() if we don't have select().
* Whether or not we have the <sys/stdtypes.h> header file.
*/
#define HAVE_POLL 0
/* #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?
*/
#undef HAVE_LIBPNG
#undef HAVE_LIBZ
#undef HAVE_LIBJPEG
#define HAVE_LIBPNG 1
#define HAVE_LIBZ 1
#define HAVE_LIBJPEG 1
/*
* Do we have the png_xyz() functions?
*/
#undef HAVE_PNG_GET_VALID
#undef HAVE_PNG_SET_TRNS_TO_ALPHA
#undef HAVE_PNG_READ_DESTROY
#define HAVE_PNG_GET_VALID 1
/* #undef HAVE_PNG_SET_TRNS_TO_ALPHA */
#define HAVE_PNG_READ_DESTROY 1
/*
* End of "$Id: config.os2x,v 1.1.2.4.2.2 2001/10/19 14:04:08 easysw Exp $".
* 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 $".
*/

View File

@ -1,10 +1,10 @@
#
# "$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-2001 by Bill Spitzak and others.
# 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
@ -31,38 +31,54 @@ datadir =${prefix}/share
includedir =${prefix}/include
libdir =${exec_prefix}/lib
mandir =${prefix}/man
srcdir =.
srcdir =./.
VPATH =./.
# programs we use...
HTMLDOC =htmldoc
HTMLDOC =htmldoc.exe
NROFF =nroff
RM =rm
RM =rm -f
# 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
OPTIM = -O2 -Wall -fno-exceptions
CFLAGS =$(OPTIM) -O4 -mpentium -Zmt
CXXFLAGS =$(OPTIM) -O4 -mpentium -Zmt
# program to make the archive:
LIBNAME =../lib/fltk.a
GLLIBNAME =../lib/fltk_gl.a
LIBCOMMAND =ar cr
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 =-lX11 -lXext -lsocket
GLDLIBS =-lX11 -lXext -lsocket
LINKFLTK =-L../lib -lfltk
LINKFLTKGL =-L../lib -lfltk_gl
IMAGELIBS =
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
@ -72,18 +88,19 @@ CAT3EXT =3
.SILENT:
# Build commands and filename extensions...
.SUFFIXES: .0 .1 .3 .c .cxx .h .fl .man .o .z
.SUFFIXES: .0 .1 .3 .c .cxx .h .fl .man .o .z $(EXEEXT)
.cxx:
echo Compiling and linking $@...
.o$(EXEEXT):
echo Linking $@...
$(CXX) -I.. $(CXXFLAGS) $< $(LINKFLTK) $(LDLIBS) -o $@
$(POSTBUILD) $@ ../FL/mac.r
.c.o:
echo Compiling $@...
echo Compiling $<...
$(CC) -I.. $(CFLAGS) -c $<
.cxx.o:
echo Compiling $@...
echo Compiling $<...
$(CXX) -I.. $(CXXFLAGS) -c $<
.man.0 .man.1 .man.3:
@ -99,5 +116,5 @@ CAT3EXT =3
mv t.z $@
#
# End of "$Id: makeinclude.os2x,v 1.1.2.4.2.4 2001/12/21 18:16:50 easysw Exp $".
# End of "$Id: makeinclude.os2x,v 1.1.2.4.2.5 2002/03/26 00:05:18 easysw Exp $".
#

View File

@ -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 $".
#