summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn-Mark Bell <jmb@netsurf-browser.org>2014-01-16 01:02:39 +0000
committerJohn-Mark Bell <jmb@netsurf-browser.org>2014-01-17 18:55:44 +0000
commitcd81b6fea00b503baf74002d926950ca5a960fdb (patch)
treec80d6d9df809d35027664dabe13c0c992f0a449b
parente2b0460c640cfec5258751fadbaa7f17ef5771e1 (diff)
downloadtoolchains-cd81b6fea00b503baf74002d926950ca5a960fdb.tar.gz
toolchains-cd81b6fea00b503baf74002d926950ca5a960fdb.tar.bz2
Update CFLIB and freetype
-rw-r--r--sdk/Makefile8
1 files changed, 5 insertions, 3 deletions
diff --git a/sdk/Makefile b/sdk/Makefile
index ac57e0a..6ddb95d 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -33,12 +33,12 @@ VERSION_LIBCARES := 1.10.0
VERSION_LIBCURL := 7.34.0
VERSION_LIBGNURX := 2.5.1
VERSION_LIBPBL := 1_04
-VERSION_LIBCF := CVS-20120227
+VERSION_LIBCF := CVS-20130415
VERSION_LIBEXPAT := 2.1.0
VERSION_LDG := 2.32
VERSION_WINDOM := 2.0.1
VERSION_HERMES := 1.3.3
-VERSION_FREETYPE := 2.4.10
+VERSION_FREETYPE := 2.5.2
VERSION_NSPR := 4.9.3
#VERSION_SPIDERMONKEY := 1.8.5
VERSION_SPIDERMONKEY := 1.7.0
@@ -82,6 +82,7 @@ SDK_ITEMS :=
COMMON_SDK_ITEMS := zlib.d openssl.d libpng.d libjpeg.d libcares.d libcurl.d libexpat.d
LIBCURL_DISABLES := $(patsubst %,--disable-%,ftp file dict ldap ldaps rtsp telnet gopher tftp pop3 imap smtp manual)
+FREETYPE_ENV := LIBPNG_CFLAGS=$$($(GCCSDK_INSTALL_ENV)/bin/libpng-config --cflags) LIBPNG_LDFLAGS=$$($(GCCSDK_INSTALL_ENV)/bin/libpng-config --ldflags)
# Target Specific setup
ifeq ($(TARGET),arm-unknown-riscos)
@@ -277,7 +278,8 @@ $(SOURCEDIR)/hermes-$(VERSION_HERMES).tar.bz2:
# freetype font lib
$(BUILDSTEPS)/freetype.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/freetype-src.d
- cd $(BUILDDIR)/freetype/freetype-$(VERSION_FREETYPE) && $(env) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --host=$(TARGET) --disable-shared
+ cd $(BUILDDIR)/freetype/freetype-$(VERSION_FREETYPE) && $(env) $(FREETYPE_ENV) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --host=$(TARGET) --disable-shared
+ cd $(BUILDDIR)/freetype/freetype-$(VERSION_FREETYPE) && $(env) make
cd $(BUILDDIR)/freetype/freetype-$(VERSION_FREETYPE) && $(env) make install
touch $@