Merge 65f27bb into fd213d1

OpenSmalltalk · Nov 16, 2018 · e9f8a2f · e9f8a2f
2 parents fd213d1 + 65f27bb
commit e9f8a2f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/build.win64x64/third-party/Makefile.freetype2 b/build.win64x64/third-party/Makefile.freetype2
@@ -3,13 +3,17 @@
 ifndef THIRDPARTYDIR
 	include ../common/Makefile.lib.extra
 endif
-include ../../third-party/freetype2.spec.win64
+include ../../third-party/freetype2.spec
 
-MINGWLIBDIR:=/usr/x86_64-w64-mingw32/sys-root/mingw/bin
+EXTERNALFILESURL:=https://files.pharo.org/vm/pharo-spur64/win/third-party
 FREETYPE2LIBNAME:=$(freetype2_spec_product_name_windows)
 FREETYPE2LIB:=$(THIRDPARTYINSTALLDIR)/$(FREETYPE2LIBNAME)
 
-$(FREETYPE2LIB): pkgconfig libpng $(MINGWLIBDIR)/$(FREETYPE2LIBNAME) 
-	cp -f $(MINGWLIBDIR)/$(FREETYPE2LIBNAME) $(THIRDPARTYINSTALLDIR)
+$(THIRDPARTYLIBDIR)/$(FREETYPE2LIBNAME):
+	echo 
+	$(WGET) -O $(THIRDPARTYLIBDIR)/$(FREETYPE2LIBNAME) $(EXTERNALFILESURL)/$(FREETYPE2LIBNAME)
 
-freetype2: $(FREETYPE2LIB)
+$(FREETYPE2LIB): pkgconfig libpng $(THIRDPARTYLIBDIR)/$(FREETYPE2LIBNAME)
+	cp -f $(THIRDPARTYLIBDIR)/$(FREETYPE2LIBNAME) $(THIRDPARTYINSTALLDIR)
+
+freetype2: $(FREETYPE2LIB)
diff --git a/third-party/freetype2.spec b/third-party/freetype2.spec
@@ -1,6 +1,6 @@
-freetype2_spec_download_url:=http://ftp.igh.cnrs.fr/pub/nongnu/freetype/freetype-2.6.5.tar.gz
-freetype2_spec_archive_name:=freetype-2.6.5.tar.gz
-freetype2_spec_unpack_dir_name:=freetype-2.6.5
+freetype2_spec_download_url:=http://ftp.igh.cnrs.fr/pub/nongnu/freetype/freetype-2.9.1.tar.gz
+freetype2_spec_archive_name:=freetype-2.9.1.tar.gz
+freetype2_spec_unpack_dir_name:=freetype-2.9.1
 freetype2_spec_product_name_macOS:=libfreetype.6.dylib
 freetype2_spec_product_name_linux:=
 freetype2_spec_product_name_windows:=libfreetype.dll