diff options
| author | Fabien Costantini <fabien@onepost.net> | 2008-10-19 01:42:35 +0000 |
|---|---|---|
| committer | Fabien Costantini <fabien@onepost.net> | 2008-10-19 01:42:35 +0000 |
| commit | 268ffc6ef2477f83a0d48af2d64baf3c00e6cddc (patch) | |
| tree | 4a500fa6716a5334f705d7d2d761771d6e28fba7 /test | |
| parent | 7a5e64a4f3c8e1126dba6909ba7379c2100b055c (diff) | |
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
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile | 3 | ||||
| -rw-r--r-- | test/cairo_test.cxx | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/test/Makefile b/test/Makefile index 7e46b93ba..5380661af 100644 --- a/test/Makefile +++ b/test/Makefile @@ -155,6 +155,7 @@ ALL = \ tile$(EXEEXT) \ tiled_image$(EXEEXT) \ valuators$(EXEEXT) \ + cairotest$(EXEEXT) \ utf8$(EXEEXT) @@ -464,6 +465,8 @@ shape$(EXEEXT): shape.o $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ shape.o $(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS) cairo_test$(EXEEXT): cairo_test.o + echo Linking $@... + $(CXX) $(ARCHFLAGS) $(CAIROFLAGS) $(LDFLAGS) -o $@ cairo_test.o $(LINKFLTK) $(LINKFLTKCAIRO) $(GLDLIBS) # # End of "$Id$". diff --git a/test/cairo_test.cxx b/test/cairo_test.cxx index 6492d4d40..bbde8ef93 100644 --- a/test/cairo_test.cxx +++ b/test/cairo_test.cxx @@ -158,7 +158,7 @@ int main(int argc, char** argv) { #include <FL/fl_ask.H> int main(int argc, char** argv) { - fl_message("please configure fltk with CAIRO enabled (--enable-cairo)"); + fl_message("please configure fltk with CAIRO enabled (--enable-cairo or --enable-cairoext)"); return 0; } #endif |