From 31df51cc80afa33814c71309f0708e5c72114cd5 Mon Sep 17 00:00:00 2001 From: HW Date: Mon, 4 Jun 2012 00:51:20 +0200 Subject: [PATCH] update to freetype-2.4.9 --- Makefile | 4 ++-- kpvcrlib/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 403aa953d..f18c98da2 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ DJVUDIR=djvulibre KPVCRLIGDIR=kpvcrlib CRENGINEDIR=$(KPVCRLIGDIR)/crengine -FREETYPEDIR=$(MUPDFDIR)/thirdparty/freetype-2.4.8 +FREETYPEDIR=$(MUPDFDIR)/thirdparty/freetype-2.4.9 LFSDIR=luafilesystem # must point to directory with *.ttf fonts for crengine @@ -111,7 +111,7 @@ kpdfview: kpdfview.o einkfb.o pdf.o blitbuffer.o drawcontext.o input.o util.o ft slider_watcher: slider_watcher.c $(CC) $(CFLAGS) $< -o $@ -ft.o: %.o: %.c +ft.o: %.o: %.c $(THIRDPARTYLIBS) $(CC) -c $(KPDFREADER_CFLAGS) -I$(FREETYPEDIR)/include -I$(MUPDFDIR)/fitz $< -o $@ kpdfview.o pdf.o blitbuffer.o util.o drawcontext.o einkfb.o input.o mupdfimg.o: %.o: %.c diff --git a/kpvcrlib/CMakeLists.txt b/kpvcrlib/CMakeLists.txt index 43dc7563a..dae382518 100644 --- a/kpvcrlib/CMakeLists.txt +++ b/kpvcrlib/CMakeLists.txt @@ -9,7 +9,7 @@ SET(CR_3RDPARTY_DIR crengine/thirdparty) SET(CR3_PNG 1) #SET(CR3_JPEG 1) -SET(FREETYPE_INCLUDE_DIRS ${MUPDF_3RDPARTY_DIR}/freetype-2.4.8/include) +SET(FREETYPE_INCLUDE_DIRS ${MUPDF_3RDPARTY_DIR}/freetype-2.4.9/include) #SET(FREETYPE_INCLUDE_DIRS ${CR_3RDPARTY_DIR}/freetype/include) SET(ANTIWORD_INCLUDE_DIR ${CR_3RDPARTY_DIR}/antiword) SET(CHM_INCLUDE_DIRS ${CR_3RDPARTY_DIR}/chmlib)