summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Rules.make3
-rw-r--r--dependencies.in8
-rw-r--r--freetype/config.in2
-rw-r--r--freetype/fontfactoryttf_qws.cpp4
-rw-r--r--freetype/fontfactoryttf_qws.h4
-rw-r--r--freetype/freetype.pro6
-rw-r--r--mkspecs/qws/linux-oe-g++/qmake.conf2
7 files changed, 26 insertions, 3 deletions
diff --git a/Rules.make b/Rules.make
index bdfe6d4..3fbce76 100644
--- a/Rules.make
+++ b/Rules.make
@@ -128,4 +128,7 @@ ifeq ($(CONFIG_LIBSWORD_DEP),y)
128 echo LIBSWORD_INC_DIR = $(CONFIG_LIBSWORD_INC_DIR) >> $@ 128 echo LIBSWORD_INC_DIR = $(CONFIG_LIBSWORD_INC_DIR) >> $@
129endif 129endif
130ifeq ($(CONFIG_LIBFREETYPE2_DEP),y)
131 echo LIBFREETYPE2_INC_DIR = $(CONFIG_LIBFREETYPE2_INC_DIR) >> $@
132endif
130$(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;) $(TOPDIR)/.config $(TOPDIR)/packages 133$(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;) $(TOPDIR)/.config $(TOPDIR)/packages
131 @echo Generating dependency information... 134 @echo Generating dependency information...
diff --git a/dependencies.in b/dependencies.in
index 357d994..4c758d3 100644
--- a/dependencies.in
+++ b/dependencies.in
@@ -95,2 +95,10 @@
95 depends LIBBLUEZ_DEP 95 depends LIBBLUEZ_DEP
96 96
97 config LIBFREETYPE2_DEP
98 boolean "Have freetype2"
99 default "n"
100
101 config LIBFREETYPE2_INC_DIR
102 string "freetype2 include dir"
103 depends LIBFREETYPE2_DEP
104
diff --git a/freetype/config.in b/freetype/config.in
index 68b659a..16d00eb 100644
--- a/freetype/config.in
+++ b/freetype/config.in
@@ -2,3 +2,3 @@
2 boolean "opie-freetype (support for fonts used via the freetype library)" 2 boolean "opie-freetype (support for fonts used via the freetype library)"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE 4 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
@@ -36,4 +36,8 @@ using namespace Opie::Core;
36 36
37extern "C" { 37extern "C" {
38
39#include <ft2build.h>
40#include FT_FREETYPE_H
41
38#include <freetype/freetype.h> 42#include <freetype/freetype.h>
39#include <freetype/ftglyph.h> 43#include <freetype/ftglyph.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
@@ -34,4 +34,8 @@
34 34
35extern "C" { 35extern "C" {
36
37#include <ft2build.h>
38#include FT_FREETYPE_H
39
36#include <freetype/freetype.h> 40#include <freetype/freetype.h>
37} 41}
diff --git a/freetype/freetype.pro b/freetype/freetype.pro
index c409577..87aaf9e 100644
--- a/freetype/freetype.pro
+++ b/freetype/freetype.pro
@@ -6,5 +6,5 @@ qt2:HEADERS += qfontdata_p.h
6 TARGET = freetypefactory 6 TARGET = freetypefactory
7 DESTDIR = $(OPIEDIR)/plugins/fontfactories 7 DESTDIR = $(OPIEDIR)/plugins/fontfactories
8 INCLUDEPATH+= $(QTDIR)/src/3rdparty/freetype/include $(QTDIR)/src/3rdparty/freetype/include/freetype/config $(OPIEDIR)/include 8 INCLUDEPATH+= $(OPIEDIR)/include
9DEPENDPATH += $(OPIEDIR)/include 9DEPENDPATH += $(OPIEDIR)/include
10LIBS += -lqpe -lfreetype -lopiecore2 10LIBS += -lqpe -lfreetype -lopiecore2
@@ -12,2 +12,6 @@ VERSION = 1.0.1
12 12
13include( $(OPIEDIR)/include.pro ) 13include( $(OPIEDIR)/include.pro )
14
15!isEmpty( LIBFREETYPE2_INC_DIR ) {
16 INCLUDEPATH = $$LIBFREETYPE2_INC_DIR $$INCLUDEPATH
17}
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
@@ -11,5 +11,5 @@ CONFIG += qt link_prl
11STAGING_BINDIR = $(OEDIR)/tmp/staging/$(OEHOSTSYS)/bin 11STAGING_BINDIR = $(OEDIR)/tmp/staging/$(OEHOSTSYS)/bin
12STAGING_CROSSDIR = $(OEDIR)/tmp/cross/bin 12STAGING_CROSSDIR = $(OEDIR)/tmp/cross/bin
13STAGING_INCDIR = $(OEDIR)/tmp/staging/arm-linux/include 13STAGING_INCDIR = $(OEDIR)/tmp/staging/arm-linux/include $(OEDIR)/tmp/staging/arm-linux/include/freetype2/include
14STAGING_LIBDIR = $(OEDIR)/tmp/staging/arm-linux/lib 14STAGING_LIBDIR = $(OEDIR)/tmp/staging/arm-linux/lib
15 15