From 268ffc6ef2477f83a0d48af2d64baf3c00e6cddc Mon Sep 17 00:00:00 2001 From: Fabien Costantini Date: Sun, 19 Oct 2008 01:42:35 +0000 Subject: Cairo increment 2: Finer cairo granularity, less deps, new fltk_cairo lib + added new USE_CAIRO config preprocessor def. to differentiate from HAVE_CAIRO so that we can use the cairo lib without forcing the full fltk lib to be linked against it. In that case, cairo autolink context functionality which needs fltk lib instrumentation is disabled. + added new --enable-cairoext, which correspond to previous --enable-cairo. now, --enable-cairo only adds HAVE_CAIRO def. and keeps fltk lib from referencing cairo. In both cases (--enable-cairo & --enable-cairoext), a new fltk_cairo lib is created. This lib, similarly to local versions of png,jpeg and zlib, is not generated if cairo is not enabled. + added cairo to fltk-config : now new --use-cairo flag is available + modified all unix like makefiles to now generate minimum cairo deps and also new libfltk_cairo lib. + added new cairo subdir to permit conditional fltk_cairo lib generation. + vc2005 project minimum update to compile without be broken, but still needs to create a similar fltk_cairo independent lib. For now, it works as before with a dedicated cairo env. similar to --enable-cairoext context in unix. + regression tested ok with cairo disabled on win32, mac osx, mingw. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6462 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- makeinclude.in | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'makeinclude.in') diff --git a/makeinclude.in b/makeinclude.in index 500f3dbbe..88bcad9d8 100644 --- a/makeinclude.in +++ b/makeinclude.in @@ -64,6 +64,7 @@ LIBNAME = @LIBNAME@ FLLIBNAME = @FLLIBNAME@ GLLIBNAME = @GLLIBNAME@ IMGLIBNAME = @IMGLIBNAME@ +CAIROLIBNAME = @CAIROLIBNAME@ LIBCOMMAND = @LIBCOMMAND@ LIBEXT = @LIBEXT@ RANLIB = @RANLIB@ @@ -71,10 +72,13 @@ DSONAME = @DSONAME@ FLDSONAME = @FLDSONAME@ GLDSONAME = @GLDSONAME@ IMGDSONAME = @IMGDSONAME@ +CAIRODSONAME = @IMGDSONAME@ DSOCOMMAND = @DSOCOMMAND@ # libraries to link with: AUDIOLIBS = @AUDIOLIBS@ +CAIROLIBS = @CAIROLIBS@ +CAIROFLAGS = @CAIROFLAGS@ DSOFLAGS = -L. @DSOFLAGS@ LDFLAGS = $(OPTIM) @LDFLAGS@ LDLIBS = @LIBS@ @@ -83,12 +87,13 @@ LINKFLTK = @LINKFLTK@ LINKFLTKGL = @LINKFLTKGL@ LINKFLTKFORMS = @LINKFLTKFORMS@ @LINKFLTK@ LINKFLTKIMG = @LINKFLTKIMG@ @LINKFLTK@ $(IMAGELIBS) -LINKSHARED = @DSOLINK@ @LINKSHARED@ $(IMAGELIBS) +LINKFLTKCAIRO = @LINKFLTKCAIRO@ $(CAIROLIBS) +LINKSHARED = @DSOLINK@ @LINKSHARED@ $(IMAGELIBS) $(CAIROLIBS) IMAGELIBS = -L../lib @IMAGELIBS@ # image libraries to build... IMAGEDIRS = @JPEG@ @ZLIB@ @PNG@ - +CAIRODIR = @CAIRODIR@ # The extension to use for executables... EXEEXT = @EXEEXT@ -- cgit v1.2.3