diff options
| -rw-r--r-- | Jamfile | 2 | ||||
| -rw-r--r-- | Jamrules | 19 | ||||
| -rw-r--r-- | apps/unix/x11pdf.c | 2 |
3 files changed, 15 insertions, 8 deletions
@@ -16,7 +16,7 @@ ALL_LOCATE_TARGET = [ FDirName $(TOP) build $(BUILD) ] ; BINDIR = [ FDirName $(TOP) dist ] ; -LINKLIBS = -lfreetype -ljpeg -lz -lm ; +LINKLIBS = $(FREETYPELD) -ljpeg -lz -lm ; FITZLIBS = libmupdf libstream libfitz librender libfonts ; if $(HAVE_JASPER) = yes @@ -5,17 +5,24 @@ # Put all configuration stuff here # -FREETYPE ?= -Ih:/package/include ; +if $(OS) = MINGW +{ + FREETYPECC ?= -Ih:/package/include ; + FREETYPELD ?= -lfreetype ; +} + +FREETYPECC ?= "`freetype-config --cflags`" ; +FREETYPELD ?= "`freetype-config --libs`" ; # Optional modules: -HAVE_JBIG2DEC = no ; -HAVE_JASPER = no ; +HAVE_JBIG2DEC ?= no ; +HAVE_JASPER ?= no ; # Select one of these for the GhostPDF GUI application if you are on unix -HAVE_X11 = no ; -HAVE_GTK = no ; +HAVE_X11 ?= no ; +HAVE_GTK ?= no ; # ------------------------------------------------------------------------- @@ -23,7 +30,7 @@ HAVE_GTK = no ; # Basic system should be mostly SUSv3 compliant # These are good for GCC -FLAG_CCALL = -Wall -D_XOPEN_SOURCE=600 $(FREETYPE) ; +FLAG_CCALL = -Wall -D_XOPEN_SOURCE=600 $(FREETYPECC) ; FLAG_CCDEBUG = -g ; FLAG_CCRELEASE = -O3 ; FLAG_CCPROFILE = -g -pg ; diff --git a/apps/unix/x11pdf.c b/apps/unix/x11pdf.c index 8a9610e8..8405762f 100644 --- a/apps/unix/x11pdf.c +++ b/apps/unix/x11pdf.c @@ -49,7 +49,7 @@ static fz_pixmap *image; void usage() { - fprintf(stderr, "usage: x11pdf [-b] [-pzr page/zoom/rotate] [-u password] file.pdf\n"); + fprintf(stderr, "usage: ghostpdf [-b] [-pzr page/zoom/rotate] [-u password] file.pdf\n"); fprintf(stderr, "\n" ); |