From 687b18f07228aac2b168ea5e3204c1c3518929a7 Mon Sep 17 00:00:00 2001
From: ar <ar>
Date: Sat, 22 Jan 2005 21:53:54 +0000
Subject: - build opie-freetype against freetype2

  you must specified <prefix>/include/freetype2 in dependencies menu (make menuconfig)
---
diff --git a/Rules.make b/Rules.make
index bdfe6d4..3fbce76 100644
--- a/Rules.make
+++ b/Rules.make
@@ -127,6 +127,9 @@ ifeq ($(CONFIG_LIBSWORD_DEP),y)
 	echo LIBSWORD_LIB_DIR = $(CONFIG_LIBSWORD_LIB_DIR) >> $@
 	echo LIBSWORD_INC_DIR = $(CONFIG_LIBSWORD_INC_DIR) >> $@
 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
 	@echo Generating dependency information...
 # add to subdir-y, and add descend rules
diff --git a/dependencies.in b/dependencies.in
index 357d994..4c758d3 100644
--- a/dependencies.in
+++ b/dependencies.in
@@ -94,3 +94,11 @@
     string "libbluez include dir"
     depends LIBBLUEZ_DEP
 
+  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
@@ -1,4 +1,4 @@
   config FREETYPE
     boolean "opie-freetype (support for fonts used via the freetype library)"
     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
@@ -35,6 +35,10 @@ using namespace Opie::Core;
 
 
 extern "C" {
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+
 #include <freetype/freetype.h>
 #include <freetype/ftglyph.h>
 #include <freetype/ftoutln.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
@@ -33,6 +33,10 @@
 #ifdef QT_NO_FREETYPE
 
 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
@@ -5,9 +5,13 @@ SOURCES		= fontfactoryttf_qws.cpp freetypefactoryimpl.cpp
 qt2:HEADERS	+= qfontdata_p.h
 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
 LIBS            += -lqpe -lfreetype -lopiecore2
 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
@@ -10,7 +10,7 @@ CONFIG			+= qt link_prl
 
 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
 
 QMAKE_CC		= $(CCACHE) $(DISTCC) $$STAGING_CROSSDIR/arm-linux-gcc
--
cgit v0.9.0.2