-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) | |||
129 | endif | 129 | endif |
130 | ifeq ($(CONFIG_LIBFREETYPE2_DEP),y) | ||
131 | echo LIBFREETYPE2_INC_DIR = $(CONFIG_LIBFREETYPE2_INC_DIR) >> $@ | ||
132 | endif | ||
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 |
diff --git a/dependencies.in b/dependencies.in index 357d994..4c758d3 100644 --- a/dependencies.in +++ b/dependencies.in | |||
@@ -96 +96,9 @@ | |||
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 | |||
@@ -3,2 +3,2 @@ | |||
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 | |||
@@ -37,2 +37,6 @@ using namespace Opie::Core; | |||
37 | extern "C" { | 37 | extern "C" { |
38 | |||
39 | #include <ft2build.h> | ||
40 | #include FT_FREETYPE_H | ||
41 | |||
38 | #include <freetype/freetype.h> | 42 | #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 @@ | |||
35 | extern "C" { | 35 | extern "C" { |
36 | |||
37 | #include <ft2build.h> | ||
38 | #include FT_FREETYPE_H | ||
39 | |||
36 | #include <freetype/freetype.h> | 40 | #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 | |||
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 |
9 | DEPENDPATH += $(OPIEDIR)/include | 9 | DEPENDPATH += $(OPIEDIR)/include |
@@ -13 +13,5 @@ VERSION = 1.0.1 | |||
13 | include( $(OPIEDIR)/include.pro ) | 13 | include( $(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 | |||
@@ -12,3 +12,3 @@ STAGING_BINDIR = $(OEDIR)/tmp/staging/$(OEHOSTSYS)/bin | |||
12 | STAGING_CROSSDIR = $(OEDIR)/tmp/cross/bin | 12 | STAGING_CROSSDIR = $(OEDIR)/tmp/cross/bin |
13 | STAGING_INCDIR = $(OEDIR)/tmp/staging/arm-linux/include | 13 | STAGING_INCDIR = $(OEDIR)/tmp/staging/arm-linux/include $(OEDIR)/tmp/staging/arm-linux/include/freetype2/include |
14 | STAGING_LIBDIR = $(OEDIR)/tmp/staging/arm-linux/lib | 14 | STAGING_LIBDIR = $(OEDIR)/tmp/staging/arm-linux/lib |