From ab896c6d5faa206ca23df371fc1c17b8a1666007 Mon Sep 17 00:00:00 2001
From: Matthias Melcher <fltk@matthiasm.com>
Date: Thu, 6 Dec 2001 02:20:36 +0000
Subject: [PATCH] FLTK 1.1.0 for Mac "Out Of The Box Experience": type 'make'
and watch... - updated configure.in and Makefiles to support Darwin (Mac OS X
BSD environment)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1813 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
configure.in | 12 +++++++++---
fluid/Makefile | 5 +++--
makeinclude.in | 8 ++++++--
test/Makefile | 19 +++++++++++++++++--
4 files changed, 35 insertions(+), 9 deletions(-)
diff --git a/configure.in b/configure.in
index 71c99cc1d..8008e45ed 100644
--- a/configure.in
+++ b/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.35 2001/12/04 19:57:45 easysw Exp $"
+dnl "$Id: configure.in,v 1.33.2.31.2.36 2001/12/06 02:20:36 matthiaswm Exp $"
dnl
dnl Configuration script for the Fast Light Tool Kit (FLTK).
dnl
@@ -258,6 +258,9 @@ AC_EXEEXT
dnl Check for standard graphics API and OpenGL...
HLINKS=
+dnl some environments need postprocessing (Darwin, MacOS)
+POSTBUILD=
+
case $uname in
CYGWIN*)
dnl Cygwin environment...
@@ -289,7 +292,7 @@ case $uname in
if test x$enable_gl != xno; then
AC_DEFINE(HAVE_GL)
AC_DEFINE(HAVE_GL_GLU_H)
- GLLIB="-framework OpenGL"
+ GLLIB="-framework AGL -framework OpenGL"
else
LINKFLTKGL=""
GLLIBNAME=""
@@ -298,6 +301,8 @@ case $uname in
fi
# Don't make symlinks because HFS+ is not case sensitive...
HLINKS="#"
+ # Add a postbuild step after linking applications
+ POSTBUILD="/Developer/Tools/Rez -t APPL ../FL/mac.r -o \$@"
;;
*)
dnl Check for X11...
@@ -371,6 +376,7 @@ esac
AC_SUBST(HLINKS)
AC_SUBST(GLDEMOS)
AC_SUBST(GLLIB)
+AC_SUBST(POSTBUILD)
dnl Figure out the appropriate formatted man page extension...
case "$uname" in
@@ -586,5 +592,5 @@ AC_OUTPUT(makeinclude fltk.list fltk-config FL/Makefile)
chmod +x fltk-config
dnl
-dnl End of "$Id: configure.in,v 1.33.2.31.2.35 2001/12/04 19:57:45 easysw Exp $".
+dnl End of "$Id: configure.in,v 1.33.2.31.2.36 2001/12/06 02:20:36 matthiaswm Exp $".
dnl
diff --git a/fluid/Makefile b/fluid/Makefile
index 08b509658..37f28766c 100644
--- a/fluid/Makefile
+++ b/fluid/Makefile
@@ -1,5 +1,5 @@
#
-# "$Id: Makefile,v 1.10.2.6.2.5 2001/11/19 21:25:35 easysw Exp $"
+# "$Id: Makefile,v 1.10.2.6.2.6 2001/12/06 02:20:36 matthiaswm Exp $"
#
# FLUID makefile for the Fast Light Tool Kit (FLTK).
#
@@ -53,6 +53,7 @@ $(PROGRAM) : $(OBJECTS) ../lib/$(LIBNAME)
echo Linking $@...
$(CXX) $(LDFLAGS) -o $(PROGRAM) $(OBJECTS) $(LINKFLTK) $(LDLIBS) \
$(IMAGELIBS)
+ $(POSTBUILD)
clean :
-@ rm -f *.o $(PROGRAM) $(CLEAN) core *~ makedepend
@@ -86,5 +87,5 @@ rebuild:
./fluid -c widget_panel.fl
#
-# End of "$Id: Makefile,v 1.10.2.6.2.5 2001/11/19 21:25:35 easysw Exp $".
+# End of "$Id: Makefile,v 1.10.2.6.2.6 2001/12/06 02:20:36 matthiaswm Exp $".
#
diff --git a/makeinclude.in b/makeinclude.in
index 59ba9db88..1dd606fd8 100644
--- a/makeinclude.in
+++ b/makeinclude.in
@@ -1,5 +1,5 @@
#
-# "$Id: makeinclude.in,v 1.7.2.11.2.9 2001/11/29 21:24:49 easysw Exp $"
+# "$Id: makeinclude.in,v 1.7.2.11.2.10 2001/12/06 02:20:36 matthiaswm Exp $"
#
# Make include file for the Fast Light Tool Kit (FLTK).
# @configure_input@
@@ -70,6 +70,9 @@ GLDEMOS =@GLDEMOS@
# The extension to use for executables...
EXEEXT =@EXEEXT@
+# Possible steps after linking...
+POSTBUILD =@POSTBUILD@
+
# Man page extensions...
CAT1EXT =@CAT1EXT@
CAT3EXT =@CAT3EXT@
@@ -83,6 +86,7 @@ CAT3EXT =@CAT3EXT@
.o$(EXEEXT):
echo Linking $@...
$(CXX) -I.. $(CXXFLAGS) $< $(LINKFLTK) $(LDLIBS) -o $@
+ $(POSTBUILD)
.c.o:
echo Compiling $@...
@@ -105,5 +109,5 @@ CAT3EXT =@CAT3EXT@
mv t.z $@
#
-# End of "$Id: makeinclude.in,v 1.7.2.11.2.9 2001/11/29 21:24:49 easysw Exp $".
+# End of "$Id: makeinclude.in,v 1.7.2.11.2.10 2001/12/06 02:20:36 matthiaswm Exp $".
#
diff --git a/test/Makefile b/test/Makefile
index 9d6b923b3..9373ca8da 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,5 +1,5 @@
#
-# "$Id: Makefile,v 1.19.2.7.2.15 2001/11/29 22:22:08 easysw Exp $"
+# "$Id: Makefile,v 1.19.2.7.2.16 2001/12/06 02:20:36 matthiaswm Exp $"
#
# Test/example program makefile for the Fast Light Tool Kit (FLTK).
#
@@ -164,57 +164,72 @@ $(ALL): ../lib/$(LIBNAME)
editor$(EXEEXT): editor.cxx
echo Compiling and linking $@...
$(CXX) -I.. $(CXXFLAGS) editor.cxx -o $@ $(LINKFLTK) $(LDLIBS) $(IMAGELIBS)
+ $(POSTBUILD)
file_chooser$(EXEEXT): file_chooser.cxx
echo Compiling and linking $@...
$(CXX) -I.. $(CXXFLAGS) file_chooser.cxx -o $@ $(LINKFLTK) $(LDLIBS) $(IMAGELIBS)
+ $(POSTBUILD)
help$(EXEEXT): help.cxx
echo Compiling and linking $@...
$(CXX) -I.. $(CXXFLAGS) help.cxx -o $@ $(LINKFLTK) $(LDLIBS) $(IMAGELIBS)
+ $(POSTBUILD)
keyboard$(EXEEXT): keyboard.cxx keyboard_ui.cxx
echo Compiling and linking $@...
$(CXX) -I.. $(CXXFLAGS) keyboard.cxx $(LINKFLTK) $(LDLIBS) -o $@
+ $(POSTBUILD)
mandelbrot$(EXEEXT): mandelbrot.cxx mandelbrot_ui.cxx
echo Compiling and linking $@...
$(CXX) -I.. $(CXXFLAGS) mandelbrot.cxx $(LINKFLTK) $(LDLIBS) -o $@
+ $(POSTBUILD)
pixmap_browser$(EXEEXT): pixmap_browser.cxx
echo Compiling and linking $@...
$(CXX) -I.. $(CXXFLAGS) pixmap_browser.cxx -o $@ $(LINKFLTK) $(LDLIBS) $(IMAGELIBS)
+ $(POSTBUILD)
# OpenGL demos...
CubeView$(EXEEXT): CubeMain.o CubeView.o CubeViewUI.o
echo Compiling and linking $@...
$(CXX) $(CXXFLAGS) CubeMain.o CubeView.o CubeViewUI.o \
$(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) -o $@
+ $(POSTBUILD)
CubeMain.o: CubeViewUI.h CubeView.h
CubeView.o: CubeView.h
cube$(EXEEXT): cube.cxx
echo Compiling and linking $@...
$(CXX) -I.. $(CXXFLAGS) cube.cxx $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) -o $@
+ $(POSTBUILD)
fractals$(EXEEXT): fractals.cxx
echo Compiling and linking $@...
$(CXX) -I.. $(CXXFLAGS) fractals.cxx $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) -o $@
+ $(POSTBUILD)
fullscreen$(EXEEXT): fullscreen.cxx
echo Compiling and linking $@...
$(CXX) -I.. $(CXXFLAGS) fullscreen.cxx $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) -o $@
+ $(POSTBUILD)
glpuzzle$(EXEEXT): glpuzzle.cxx
echo Compiling and linking $@...
$(CXX) -I.. $(CXXFLAGS) glpuzzle.cxx $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) -o $@
+ $(POSTBUILD)
gl_overlay$(EXEEXT): gl_overlay.cxx
echo Compiling and linking $@...
$(CXX) -I.. $(CXXFLAGS) gl_overlay.cxx $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) -o $@
+ $(POSTBUILD)
shiny$(EXEEXT): shiny.cxx shiny_panel.cxx
echo Compiling and linking $@...
$(CXX) -I.. $(CXXFLAGS) shiny.cxx $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) -o $@
+ $(POSTBUILD)
shape$(EXEEXT): shape.cxx
echo Compiling and linking $@...
$(CXX) -I.. $(CXXFLAGS) shape.cxx $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) -o $@
+ $(POSTBUILD)
# If you have libjpeg installed, you might want to try this test program:
jpeg_image$(EXEEXT): jpeg_image.cxx
echo Compiling and linking $@...
$(CXX) -I.. $(CXXFLAGS) jpeg_image.cxx $(LINKFLTK) $(LDLIBS) -ljpeg -lXext -o $@
+ $(POSTBUILD)
depend:
# $(MAKEDEPEND) -I.. $(CXXFLAGS) $(CPPFILES) > makedepend
@@ -230,5 +245,5 @@ uninstall:
@echo Nothing to uninstall in test directory.
#
-# End of "$Id: Makefile,v 1.19.2.7.2.15 2001/11/29 22:22:08 easysw Exp $".
+# End of "$Id: Makefile,v 1.19.2.7.2.16 2001/12/06 02:20:36 matthiaswm Exp $".
#
--
GitLab