diff options
| author | Sebastian Rasmussen <sebras@hotmail.com> | 2009-11-20 09:57:46 +0100 |
|---|---|---|
| committer | Sebastian Rasmussen <sebras@hotmail.com> | 2009-11-20 09:57:46 +0100 |
| commit | 71a5ecaed1293ba6474ffea8b639ba51c7c2baeb (patch) | |
| tree | d5739817b17268c4dc5cf5660d926c075a577433 | |
| parent | 7cfa68558266b5a143d4b3378e8f7cd64a9eb144 (diff) | |
| download | mupdf-71a5ecaed1293ba6474ffea8b639ba51c7c2baeb.tar.xz | |
Fix lingering references to Jasper in Jamrules and Jamfiles.
| -rw-r--r-- | Jamrules | 7 | ||||
| -rw-r--r-- | fitz/Jamfile | 3 |
2 files changed, 1 insertions, 9 deletions
@@ -23,8 +23,6 @@ # # -sHAVE_JBIG2DEC=true # -# -sHAVE_JASPER=true -# -- or -- # -sHAVE_OPENJPEG=true # # To compile without builtin CJK CMap and font support, and save a few @@ -44,7 +42,6 @@ ALL_LOCATE_TARGET ?= [ FDirName $(TOP) build $(OS:L)-$(OSPLAT:L)-$(BUILD:L) ] ; # Add compile time defines for JBIG2 and JPEG2000 support. if $(HAVE_JBIG2DEC) { DEFINES += HAVE_JBIG2DEC ; } -if $(HAVE_JASPER) { DEFINES += HAVE_JASPER ; } if $(HAVE_OPENJPEG) { DEFINES += HAVE_OPENJPEG ; } if $(OS) = LINUX @@ -62,7 +59,6 @@ if $(OS) = LINUX if $(BUILD) = release { OPTIM = -O3 ; } if $(HAVE_JBIG2DEC) { LINKLIBS += -ljbig2dec ; } - if $(HAVE_JASPER) { LINKLIBS += -ljasper ; } if $(HAVE_OPENJPEG) { LINKLIBS += -lopenjpeg ; } } @@ -81,7 +77,6 @@ if $(OS) = MACOSX if $(BUILD) = release { OPTIM = -O3 ; } if $(HAVE_JBIG2DEC) { LINKLIBS += -ljbig2dec ; } - if $(HAVE_JASPER) { LINKLIBS += -ljasper ; } if $(HAVE_OPENJPEG) { LINKLIBS += -lopenjpeg ; } } @@ -103,7 +98,6 @@ if $(OS) = MINGW if $(BUILD) = release { OPTIM = -O3 ; } if $(HAVE_JBIG2DEC) { LINKLIBS += -ljbig2dec ; } - if $(HAVE_JASPER) { LINKLIBS += -ljasper ; } if $(HAVE_OPENJPEG) { LINKLIBS += -lopenjpeg ; } actions WindRes { windres -i $(>) -o $(<) --include-dir=$(>:D) } @@ -126,7 +120,6 @@ if $(OS) = NT if $(BUILD) = release { } if $(HAVE_JBIG2DEC) { LINKLIBS += jbig2dec.lib ; } - if $(HAVE_JASPER) { LINKLIBS += jasper.lib ; } if $(HAVE_OPENJPEG) { LINKLIBS += openjpeg.lib ; } actions WindRes { rc /fo $(<) $(>) } diff --git a/fitz/Jamfile b/fitz/Jamfile index 4be1beb5..81d2fc7c 100644 --- a/fitz/Jamfile +++ b/fitz/Jamfile @@ -65,8 +65,7 @@ Library libfitz : ; if $(HAVE_JBIG2DEC) { Library libfitz : filt_jbig2d.c ; } -if $(HAVE_JASPER) { Library libfitz : filt_jpxd_jas.c ; } -if $(HAVE_OPENJPEG) { Library libfitz : filt_jpxd_opj.c ; } +if $(HAVE_OPENJPEG) { Library libfitz : filt_jpxd.c ; } # # Resources and display tree. |