From: Markham <markham001@gmx.de>
Date: Fri, 22 Apr 2016 06:20:45 +0000 (+0200)
Subject: update target freetype for 3rd-party-tools
X-Git-Url: https://git.webhop.me/?a=commitdiff_plain;h=77ad69a59aeb3ee68617e8d09c0ab1562ad32f3b;p=bs-cst-neutrino-hd.git

update target freetype for 3rd-party-tools
---

diff --git a/make/libraries.mk b/make/libraries.mk
index d43f122..99bc18d 100755
--- a/make/libraries.mk
+++ b/make/libraries.mk
@@ -209,6 +209,9 @@ $(D)/freetype: $(D)/libpng $(ARCHIVE)/freetype-$(FREETYPE_VER).tar.bz2 | $(TARGE
 		sed -e "s,^prefix=,prefix=$(TARGETPREFIX)," < builds/unix/freetype-config > $(HOSTPREFIX)/bin/freetype-config; \
 		chmod 755 $(HOSTPREFIX)/bin/freetype-config; \
 		$(MAKE) install libdir=$(TARGETPREFIX)/lib includedir=$(TARGETPREFIX)/include bindir=$(TARGETPREFIX)/bin prefix=$(TARGETPREFIX)
+	pushd $(TARGETPREFIX)/include; \
+			ln -sf freetype2/freetype freetype; \
+			ln -sf freetype2/ft2build.h ft2build.h
 	rm $(TARGETPREFIX)/bin/freetype-config
 	$(REWRITE_LIBTOOL)/libfreetype.la
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/freetype2.pc
diff --git a/make/neutrino.mk b/make/neutrino.mk
index ec43c13..70d9ca3 100755
--- a/make/neutrino.mk
+++ b/make/neutrino.mk
@@ -31,7 +31,6 @@ N_CFLAGS += -I$(NEUTRINO_OBJDIR)
 N_CFLAGS += -I$(NEUTRINO_OBJDIR)/src/gui
 
 N_CPPFLAGS = -I$(TARGETPREFIX)/include
-N_CPPFLAGS += -I$(TARGETPREFIX)/include/freetype2
 N_CPPFLAGS += -Werror -Wsign-compare
 #N_CPPFLAGS += -D_GLIBCXX_USE_CXX11_ABI=0