| -rw-r--r-- | Rules.make | 3 | ||||
| -rw-r--r-- | dependencies.in | 8 | ||||
| -rw-r--r-- | freetype/config.in | 2 | ||||
| -rw-r--r-- | freetype/fontfactoryttf_qws.cpp | 4 | ||||
| -rw-r--r-- | freetype/fontfactoryttf_qws.h | 4 | ||||
| -rw-r--r-- | freetype/freetype.pro | 6 | ||||
| -rw-r--r-- | mkspecs/qws/linux-oe-g++/qmake.conf | 2 |
7 files changed, 26 insertions, 3 deletions
@@ -129,2 +129,5 @@ ifeq ($(CONFIG_LIBSWORD_DEP),y) endif +ifeq ($(CONFIG_LIBFREETYPE2_DEP),y) + echo LIBFREETYPE2_INC_DIR = $(CONFIG_LIBFREETYPE2_INC_DIR) >> $@ +endif $(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;) $(TOPDIR)/.config $(TOPDIR)/packages diff --git a/dependencies.in b/dependencies.in index 357d994..4c758d3 100644 --- a/dependencies.in +++ b/dependencies.in @@ -96 +96,9 @@ + config LIBFREETYPE2_DEP + boolean "Have freetype2" + default "n" + + config LIBFREETYPE2_INC_DIR + string "freetype2 include dir" + depends LIBFREETYPE2_DEP + diff --git a/freetype/config.in b/freetype/config.in index 68b659a..16d00eb 100644 --- a/freetype/config.in +++ b/freetype/config.in @@ -3,2 +3,2 @@ default "y" - depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBFREETYPE2_DEP diff --git a/freetype/fontfactoryttf_qws.cpp b/freetype/fontfactoryttf_qws.cpp index 1ed0d2c..6d41c33 100644 --- a/freetype/fontfactoryttf_qws.cpp +++ b/freetype/fontfactoryttf_qws.cpp @@ -37,2 +37,6 @@ using namespace Opie::Core; extern "C" { + +#include <ft2build.h> +#include FT_FREETYPE_H + #include <freetype/freetype.h> diff --git a/freetype/fontfactoryttf_qws.h b/freetype/fontfactoryttf_qws.h index ff0fcfc..ddf5b57 100644 --- a/freetype/fontfactoryttf_qws.h +++ b/freetype/fontfactoryttf_qws.h @@ -35,2 +35,6 @@ extern "C" { + +#include <ft2build.h> +#include FT_FREETYPE_H + #include <freetype/freetype.h> diff --git a/freetype/freetype.pro b/freetype/freetype.pro index c409577..87aaf9e 100644 --- a/freetype/freetype.pro +++ b/freetype/freetype.pro @@ -7,3 +7,3 @@ TARGET = freetypefactory DESTDIR = $(OPIEDIR)/plugins/fontfactories -INCLUDEPATH += $(QTDIR)/src/3rdparty/freetype/include $(QTDIR)/src/3rdparty/freetype/include/freetype/config $(OPIEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include @@ -13 +13,5 @@ VERSION = 1.0.1 include( $(OPIEDIR)/include.pro ) + +!isEmpty( LIBFREETYPE2_INC_DIR ) { + INCLUDEPATH = $$LIBFREETYPE2_INC_DIR $$INCLUDEPATH +} diff --git a/mkspecs/qws/linux-oe-g++/qmake.conf b/mkspecs/qws/linux-oe-g++/qmake.conf index 90166b0..72bb489 100644 --- a/mkspecs/qws/linux-oe-g++/qmake.conf +++ b/mkspecs/qws/linux-oe-g++/qmake.conf @@ -12,3 +12,3 @@ STAGING_BINDIR = $(OEDIR)/tmp/staging/$(OEHOSTSYS)/bin STAGING_CROSSDIR = $(OEDIR)/tmp/cross/bin -STAGING_INCDIR = $(OEDIR)/tmp/staging/arm-linux/include +STAGING_INCDIR = $(OEDIR)/tmp/staging/arm-linux/include $(OEDIR)/tmp/staging/arm-linux/include/freetype2/include STAGING_LIBDIR = $(OEDIR)/tmp/staging/arm-linux/lib |