]> git.webhop.me Git - bs-cst-neutrino-hd.git/commitdiff
update target freetype for 3rd-party-tools
authorMarkham <markham001@gmx.de>
Fri, 22 Apr 2016 06:20:45 +0000 (08:20 +0200)
committerMarkham <markham001@gmx.de>
Fri, 22 Apr 2016 06:20:45 +0000 (08:20 +0200)
make/libraries.mk
make/neutrino.mk

index d43f12202d9e8217fefb7f244e2c3690aac6dea8..99bc18df3f0e0a359ee213c026f600a9613c0d25 100755 (executable)
@@ -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
index ec43c13dc73e9a93350e7cf98ac191c93fc2d2f7..70d9ca3a140117d2bb96e48f7fccc73e64f9732e 100755 (executable)
@@ -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