Author: matt
Date: 2011-05-26 07:43:46 -0700 (Thu, 26 May 2011)
New Revision: 8740
Log:
123: fixed Makfile and support to compile on OS X via command line tools.
Modified:
branches/branch-3.0/configure.in
branches/branch-3.0/makeinclude.in
branches/branch-3.0/src/Makefile
branches/branch-3.0/src/numericsort.cxx
branches/branch-3.0/test/Makefile
Modified: branches/branch-3.0/configure.in
===================================================================
--- branches/branch-3.0/configure.in 2011-05-26 13:53:45 UTC (rev 8739)
+++ branches/branch-3.0/configure.in 2011-05-26 14:43:46 UTC (rev 8740)
@@ -117,20 +117,17 @@
dnl Define the libraries and link options we will need.
LINKFLTK="../lib/libfltk.a"
-LINKFLTKFORMS="../lib/libfltk_forms.a"
LINKFLTKGL="../lib/libfltk_gl.a"
LINKFLTKIMG="../lib/libfltk_images.a"
GLDEMOS="gldemos"
LIBEXT=".a"
LIBNAME="../lib/libfltk.a"
-FLLIBNAME="../lib/libfltk_forms.a"
GLLIBNAME="../lib/libfltk_gl.a"
IMGLIBNAME="../lib/libfltk_images.a"
CAIROLIBNAME="../lib/libfltk_cairo.a"
LIBBASENAME="libfltk.a"
-FLLIBBASENAME="libfltk_forms.a"
GLLIBBASENAME="libfltk_gl.a"
IMGLIBBASENAME="libfltk_images.a"
CAIROLIBBASENAME="libfltk_cairo.a"
@@ -188,7 +185,6 @@
AC_SUBST(LIBEXT)
AC_SUBST(LIBNAME)
AC_SUBST(LINKFLTK)
-AC_SUBST(LINKFLTKFORMS)
AC_SUBST(LINKFLTKGL)
AC_SUBST(LINKFLTKIMG)
@@ -223,7 +219,6 @@
case $uname in
Darwin*)
DSONAME="libfltk.$FL_API_VERSION.dylib"
- FLDSONAME="libfltk_forms.$FL_API_VERSION.dylib"
GLDSONAME="libfltk_gl.$FL_API_VERSION.dylib"
IMGDSONAME="libfltk_images.$FL_API_VERSION.dylib"
CAIRODSONAME="libfltk_cairo.$FL_API_VERSION.dylib"
@@ -232,7 +227,6 @@
SunOS* | UNIX_S*)
DSONAME="libfltk.so.$FL_API_VERSION"
- FLDSONAME="libfltk_forms.so.$FL_API_VERSION"
GLDSONAME="libfltk_gl.so.$FL_API_VERSION"
IMGDSONAME="libfltk_images.so.$FL_API_VERSION"
CAIRODSONAME="libfltk_cairo.so.$FL_API_VERSION"
@@ -243,7 +237,6 @@
;;
HP-UX*)
DSONAME="libfltk.sl.$FL_API_VERSION"
- FLDSONAME="libfltk_forms.sl.$FL_API_VERSION"
GLDSONAME="libfltk_gl.sl.$FL_API_VERSION"
IMGDSONAME="libfltk_images.sl.$FL_API_VERSION"
CAIRODSONAME="libfltk_cairo.sl.$FL_API_VERSION"
@@ -254,7 +247,6 @@
;;
IRIX*)
DSONAME="libfltk.so.$FL_API_VERSION"
- FLDSONAME="libfltk_forms.so.$FL_API_VERSION"
GLDSONAME="libfltk_gl.so.$FL_API_VERSION"
IMGDSONAME="libfltk_images.so.$FL_API_VERSION"
CAIRODSONAME="libfltk_cairo.so.$FL_API_VERSION"
@@ -265,7 +257,6 @@
;;
OSF1*)
DSONAME="libfltk.so.$FL_API_VERSION"
- FLDSONAME="libfltk_forms.so.$FL_API_VERSION"
GLDSONAME="libfltk_gl.so.$FL_API_VERSION"
IMGDSONAME="libfltk_images.so.$FL_API_VERSION"
CAIRODSONAME="libfltk_cairo.so.$FL_API_VERSION"
@@ -276,7 +267,6 @@
;;
Linux* | *BSD*)
DSONAME="libfltk.so.$FL_API_VERSION"
- FLDSONAME="libfltk_forms.so.$FL_API_VERSION"
GLDSONAME="libfltk_gl.so.$FL_API_VERSION"
IMGDSONAME="libfltk_images.so.$FL_API_VERSION"
CAIRODSONAME="libfltk_cairo.so.$FL_API_VERSION"
@@ -287,7 +277,6 @@
;;
AIX*)
DSONAME="libfltk_s.a"
- FLDSONAME="libfltk_forms_s.a"
GLDSONAME="libfltk_gl_s.a"
IMGDSONAME="libfltk_images_s.a"
CAIRODSONAME="libfltk_cairo_s.a"
@@ -298,20 +287,17 @@
PICFLAG=0
if test x$enable_cygwin != xyes; then
DSONAME="mgwfltknox-$FL_API_VERSION.dll"
- FLDSONAME="mgwfltknox_forms-$FL_API_VERSION.dll"
GLDSONAME="mgwfltknox_gl-$FL_API_VERSION.dll"
IMGDSONAME="mgwfltknox_images-$FL_API_VERSION.dll"
CAIRODSONAME="mgwfltknox_cairo-$FL_API_VERSION.dll"
else
if test x$enable_x11 = xyes; then
DSONAME="cygfltk-$FL_API_VERSION.dll"
- FLDSONAME="cygfltk_forms-$FL_API_VERSION.dll"
GLDSONAME="cygfltk_gl-$FL_API_VERSION.dll"
IMGDSONAME="cygfltk_images-$FL_API_VERSION.dll"
CAIRODSONAME="cygfltk_cairo-$FL_API_VERSION.dll"
else
DSONAME="cygfltknox-$FL_API_VERSION.dll"
- FLDSONAME="cygfltknox_forms-$FL_API_VERSION.dll"
GLDSONAME="cygfltknox_gl-$FL_API_VERSION.dll"
IMGDSONAME="cygfltknox_images-$FL_API_VERSION.dll"
CAIRODSONAME="cygfltknox_cairo-$FL_API_VERSION.dll"
@@ -330,7 +316,6 @@
*)
AC_MSG_WARN(Shared libraries may not be supported. Trying -shared
option with compiler.)
DSONAME="libfltk.so.$FL_API_VERSION"
- FLDSONAME="libfltk_forms.so.$FL_API_VERSION"
GLDSONAME="libfltk_gl.so.$FL_API_VERSION"
IMGDSONAME="libfltk_images.so.$FL_API_VERSION"
CAIRODSONAME="libfltk_cairo.so.$FL_API_VERSION"
@@ -338,7 +323,7 @@
;;
esac
- LINKSHARED="-L../src $FLTKCAIROOPTION -lfltk_images$SHAREDSUFFIX
-lfltk_forms$SHAREDSUFFIX -lfltk$SHAREDSUFFIX"
+ LINKSHARED="-L../src $FLTKCAIROOPTION -lfltk_images$SHAREDSUFFIX
-lfltk$SHAREDSUFFIX"
else
DSOCOMMAND="echo"
DSOLINK=""
@@ -350,7 +335,7 @@
PICFLAG=0
SHAREDSUFFIX=""
FLUID="fluid"
- LINKSHARED="$LINKFLTKCAIRO ../lib/libfltk_images.a ../lib/libfltk_forms.a
../lib/libfltk.a"
+ LINKSHARED="$LINKFLTKCAIRO ../lib/libfltk_images.a ../lib/libfltk.a"
fi
AC_SUBST(DSOCOMMAND)
Modified: branches/branch-3.0/makeinclude.in
===================================================================
--- branches/branch-3.0/makeinclude.in 2011-05-26 13:53:45 UTC (rev 8739)
+++ branches/branch-3.0/makeinclude.in 2011-05-26 14:43:46 UTC (rev 8740)
@@ -94,7 +94,6 @@
GLDLIBS = @GLLIB@ @LIBS@
LINKFLTK = @LINKFLTK@
LINKFLTKGL = @LINKFLTKGL@
-LINKFLTKFORMS = @LINKFLTKFORMS@ @LINKFLTK@
LINKFLTKIMG = @LINKFLTKIMG@ @LINKFLTK@ $(IMAGELIBS)
LINKFLTKCAIRO = @LINKFLTKCAIRO@ $(CAIROLIBS)
FLTKCAIROOPTION = @FLTKCAIROOPTION@
Modified: branches/branch-3.0/src/Makefile
===================================================================
--- branches/branch-3.0/src/Makefile 2011-05-26 13:53:45 UTC (rev 8739)
+++ branches/branch-3.0/src/Makefile 2011-05-26 14:43:46 UTC (rev 8740)
@@ -166,7 +166,8 @@
screen_xywh.cxx \
fl_utf8.cxx \
ps_image.cxx \
- numericsort.cxx
+ numericsort.cxx \
+ fl_utf.cxx
OBJCPPFILES = \
Fl_cocoa.mm \
@@ -198,7 +199,7 @@
Fl_PNM_Image.cxx
-CFILES = fl_call_main.c flstring.c scandir.c vsnprintf.c fl_utf.c
+CFILES = fl_call_main.c flstring.c scandir.c vsnprintf.c
UTF8CFILES = \
xutf8/case.c \
Modified: branches/branch-3.0/src/numericsort.cxx
===================================================================
--- branches/branch-3.0/src/numericsort.cxx 2011-05-26 13:53:45 UTC (rev
8739)
+++ branches/branch-3.0/src/numericsort.cxx 2011-05-26 14:43:46 UTC (rev
8740)
@@ -48,9 +48,8 @@
# include <ndir.h>
# endif /* HAVE_NDIR_H */
# endif /* HAVE_DIRENT_H */
-#else /* For WIN32 variants */
-# include <fltk3/filename.h>
#endif /* !WIN32 || __CYGWIN__ */
+#include <fltk3/filename.h>
/*
* 'numericsort()' - Compare two directory entries, possibly with
Modified: branches/branch-3.0/test/Makefile
===================================================================
--- branches/branch-3.0/test/Makefile 2011-05-26 13:53:45 UTC (rev 8739)
+++ branches/branch-3.0/test/Makefile 2011-05-26 14:43:46 UTC (rev 8740)
@@ -318,7 +318,7 @@
demo$(EXEEXT): demo.o
echo Linking $@...
- $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ demo.o $(LINKFLTKFORMS) $(LDLIBS)
+ $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ demo.o $(LINKFLTK) $(LDLIBS)
device$(EXEEXT): device.o $(IMGLIBNAME)
echo Linking $@...
@@ -364,7 +364,7 @@
label$(EXEEXT): label.o
echo Linking $@...
- $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ label.o $(LINKFLTKFORMS) $(LDLIBS)
+ $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ label.o $(LINKFLTK) $(LDLIBS)
line_style$(EXEEXT): line_style.o
@@ -390,7 +390,7 @@
output$(EXEEXT): output.o $(FLLIBNAME)
echo Linking $@...
- $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ output.o $(LINKFLTKFORMS) $(LDLIBS)
+ $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ output.o $(LINKFLTK) $(LDLIBS)
overlay$(EXEEXT): overlay.o
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
